From a47826b7c286e083d5ab9e62236014ab76afbebc Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Tue, 14 Apr 2026 01:15:18 +0700 Subject: [PATCH] format all files --- devices/home-server/configuration.nix | 3 +- .../home-server/hardware-configuration.nix | 15 +- devices/ideapad-slim-5/configuration.nix | 10 +- .../ideapad-slim-5/hardware-configuration.nix | 45 +++--- devices/ideapad-slim-5/mount.nix | 44 +++--- flake.nix | 85 +++++----- home/asakiyuki/configuration.nix | 9 +- home/asakiyuki/files.nix | 55 +++---- home/asakiyuki/programs.nix | 3 +- home/junko/configuration.nix | 8 +- host/desktop/default.nix | 15 +- host/desktop/device.nix | 12 +- host/desktop/programs.nix | 5 +- host/server/default.nix | 3 +- host/server/device.nix | 3 +- host/server/networking.nix | 3 +- host/server/programs.nix | 3 +- host/server/services.nix | 3 +- libs/default.nix | 6 +- modules/features/home/bash.nix | 123 ++++++++------- modules/features/home/browsers.nix | 9 +- modules/features/home/fastfetch.nix | 6 +- modules/features/home/ghostty.nix | 89 ++++++----- modules/features/home/git.nix | 32 ++-- modules/features/home/kitty.nix | 149 +++++++++--------- modules/features/home/neovide.nix | 14 +- modules/features/home/niri.nix | 24 +-- modules/features/home/obs-studio.nix | 14 +- modules/features/home/packages.nix | 47 +++--- modules/features/home/starship.nix | 6 +- modules/features/home/theme.nix | 70 ++++---- modules/features/home/tmux.nix | 13 +- modules/features/home/vscode.nix | 3 +- modules/features/home/xdg.nix | 31 ++-- modules/features/system/boot.nix | 47 +++--- modules/features/system/cloudflare.nix | 10 +- modules/features/system/dconf.nix | 17 +- modules/features/system/docker.nix | 3 +- modules/features/system/flatpak.nix | 14 +- modules/features/system/gdm.nix | 11 +- modules/features/system/gnome.nix | 14 +- modules/features/system/hyprland.nix | 14 +- modules/features/system/input-method.nix | 20 +-- modules/features/system/kde-plasma.nix | 16 +- modules/features/system/niri.nix | 12 +- modules/features/system/nix-dl.nix | 28 ++-- modules/features/system/packages.nix | 15 +- modules/features/system/sddm.nix | 49 +++--- modules/features/system/steam.nix | 14 +- modules/features/system/udisks2.nix | 10 +- modules/features/system/upower.nix | 10 +- modules/features/system/waydroid.nix | 23 +-- modules/fonts.nix | 8 +- modules/hardware/bluetooth.nix | 6 +- modules/hardware/default.nix | 11 +- modules/home-manager.nix | 14 +- modules/programs/hyprland/default.nix | 6 +- .../programs/hyprland/settings/default.nix | 4 +- modules/programs/hyprland/settings/exec.nix | 4 +- modules/programs/hyprland/settings/input.nix | 3 +- .../programs/hyprland/settings/key-bind.nix | 109 +++++++------ modules/programs/hyprland/settings/theme.nix | 114 +++++++------- .../hyprland/settings/window-rules.nix | 14 +- modules/programs/nixcord/default.nix | 10 +- modules/programs/nixvim/_nixvim.nix | 3 +- modules/programs/nixvim/default.nix | 4 +- modules/programs/nixvim/extra-packages.nix | 3 +- modules/programs/nixvim/keymaps/_keymaps.nix | 6 +- modules/programs/nixvim/keymaps/barbar.nix | 12 +- .../programs/nixvim/keymaps/toggleterm.nix | 3 +- modules/programs/nixvim/lua/_lua.nix | 4 +- .../programs/nixvim/plugins/_extraPlugins.nix | 26 ++- modules/programs/nixvim/plugins/_plugins.nix | 3 +- modules/programs/nixvim/plugins/cmp.nix | 44 +++--- .../programs/nixvim/plugins/conform-nvim.nix | 17 +- .../nixvim/plugins/extras/mini-icons.nix | 7 +- .../nixvim/plugins/extras/neocord.nix | 7 +- modules/programs/nixvim/plugins/lint.nix | 3 +- modules/programs/nixvim/plugins/lsp.nix | 3 +- modules/programs/nixvim/plugins/lspkind.nix | 6 +- modules/programs/nixvim/plugins/nvimtree.nix | 8 +- modules/programs/nixvim/plugins/which-key.nix | 3 +- modules/services/adguardhome.nix | 3 +- modules/services/cloudflare-dyndns.nix | 5 +- modules/services/fail2ban.nix | 3 +- modules/services/openssh.nix | 7 +- modules/services/pipewire.nix | 3 +- options/home/default.nix | 7 +- options/home/programs.nix | 34 ++-- options/system/default.nix | 3 +- options/system/environment.nix | 3 +- options/system/file.nix | 11 +- options/system/hardware.nix | 10 +- options/system/programs.nix | 25 +-- overlays/nixpkgs.nix | 12 +- packages/bun.nix | 2 +- packages/cage-xtmapper-0.1.5.nix | 76 +++++---- packages/cage-xtmapper-0.2.0.nix | 76 +++++---- packages/catppuccin-obs.nix | 3 +- packages/custom-cursors.nix | 53 ++++--- packages/default.nix | 19 ++- 101 files changed, 1073 insertions(+), 1034 deletions(-) diff --git a/devices/home-server/configuration.nix b/devices/home-server/configuration.nix index 3430bd1..98e45be 100644 --- a/devices/home-server/configuration.nix +++ b/devices/home-server/configuration.nix @@ -1,5 +1,4 @@ -{ libs, ... }: -{ +{libs, ...}: { imports = [ ./hardware-configuration.nix (libs.root "/host/server/default.nix") diff --git a/devices/home-server/hardware-configuration.nix b/devices/home-server/hardware-configuration.nix index 8d19e80..34620a6 100644 --- a/devices/home-server/hardware-configuration.nix +++ b/devices/home-server/hardware-configuration.nix @@ -4,13 +4,10 @@ { config, lib, - pkgs, modulesPath, ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; +}: { + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; boot.initrd.availableKernelModules = [ "xhci_pci" @@ -19,9 +16,9 @@ "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; fileSystems = { "/" = { @@ -35,7 +32,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-uuid/cfa7f30f-f08a-4400-babe-41357586a6a0"; } + {device = "/dev/disk/by-uuid/cfa7f30f-f08a-4400-babe-41357586a6a0";} ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/devices/ideapad-slim-5/configuration.nix b/devices/ideapad-slim-5/configuration.nix index 9d57529..c8bd10c 100755 --- a/devices/ideapad-slim-5/configuration.nix +++ b/devices/ideapad-slim-5/configuration.nix @@ -1,10 +1,8 @@ { - lib, libs, pkgs, ... -}: -{ +}: { imports = [ ./hardware-configuration.nix ./mount.nix @@ -18,8 +16,8 @@ nixpkgs.config.allowUnfree = true; - boot.kernelParams = [ "amd_pstate=active" ]; - boot.kernelModules = [ "ideapad_laptop" ]; + boot.kernelParams = ["amd_pstate=active"]; + boot.kernelModules = ["ideapad_laptop"]; services.power-profiles-daemon.enable = true; environment.systemPackages = with pkgs; [ lm_sensors @@ -38,6 +36,6 @@ }; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = [ pkgs.linuxPackages_latest.zenpower ]; + boot.extraModulePackages = [pkgs.linuxPackages_latest.zenpower]; system.stateVersion = "25.11"; } diff --git a/devices/ideapad-slim-5/hardware-configuration.nix b/devices/ideapad-slim-5/hardware-configuration.nix index a1eee23..4c69537 100755 --- a/devices/ideapad-slim-5/hardware-configuration.nix +++ b/devices/ideapad-slim-5/hardware-configuration.nix @@ -1,32 +1,35 @@ # 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 = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/85ab0f38-b6e7-4046-a33b-ce7b9812b959"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2221-C55B"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/2221-C55B"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/20e229eb-f32e-4369-be96-25275ebc8ae3";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/devices/ideapad-slim-5/mount.nix b/devices/ideapad-slim-5/mount.nix index 303f838..4c85d22 100644 --- a/devices/ideapad-slim-5/mount.nix +++ b/devices/ideapad-slim-5/mount.nix @@ -1,23 +1,23 @@ -{ ... }: { - fileSystems = { - "/mnt/windows" = { - device = "/dev/disk/by-uuid/0000294D000006E6"; - fsType = "ntfs-3g"; - options = [ - "rw" - "uid=1000" - "gid=100" - "umask=022" - ]; - }; - "/mnt/waydroid" = { - device = "/home/asakiyuki/.local/share/waydroid/data/media/0"; - fsType = "fuse.bindfs"; - options = [ - "mirror=1000" - "xattr-none" - "chmod-ignore" - ]; - }; +{...}: { + fileSystems = { + "/mnt/windows" = { + device = "/dev/disk/by-uuid/0000294D000006E6"; + fsType = "ntfs-3g"; + options = [ + "rw" + "uid=1000" + "gid=100" + "umask=022" + ]; }; -} \ No newline at end of file + "/mnt/waydroid" = { + device = "/home/asakiyuki/.local/share/waydroid/data/media/0"; + fsType = "fuse.bindfs"; + options = [ + "mirror=1000" + "xattr-none" + "chmod-ignore" + ]; + }; + }; +} diff --git a/flake.nix b/flake.nix index e68d653..cff00bd 100644 --- a/flake.nix +++ b/flake.nix @@ -29,53 +29,50 @@ }; }; - outputs = - { - self, - nixpkgs, - unstablepkgs, - ... - }@inputs: - let - libs = import ./libs/default.nix inputs; - custom = import ./packages/default.nix inputs; - unstable = import unstablepkgs { + outputs = { + self, + nixpkgs, + unstablepkgs, + ... + } @ inputs: let + libs = import ./libs/default.nix inputs; + custom = import ./packages/default.nix inputs; + unstable = import unstablepkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + + specialArgs = { + inherit + self + custom + libs + unstable + inputs + ; + }; + in { + nixosConfigurations = { + ideapad-slim-5 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - config.allowUnfree = true; + specialArgs = specialArgs; + modules = [ + inputs.nixos-hardware.nixosModules.lenovo-ideapad-slim-5 + inputs.nix-index-database.nixosModules.default + inputs.home-manager.nixosModules.default + (libs.root "/devices/ideapad-slim-5/configuration.nix") + ]; }; - specialArgs = { - inherit - self - custom - libs - unstable - inputs - ; - }; - in - { - nixosConfigurations = { - ideapad-slim-5 = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = specialArgs; - modules = [ - inputs.nixos-hardware.nixosModules.lenovo-ideapad-slim-5 - inputs.nix-index-database.nixosModules.default - inputs.home-manager.nixosModules.default - (libs.root "/devices/ideapad-slim-5/configuration.nix") - ]; - }; - - home-server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = specialArgs; - modules = [ - inputs.nix-index-database.nixosModules.default - inputs.home-manager.nixosModules.default - (libs.root "/devices/home-server/configuration.nix") - ]; - }; + home-server = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = specialArgs; + modules = [ + inputs.nix-index-database.nixosModules.default + inputs.home-manager.nixosModules.default + (libs.root "/devices/home-server/configuration.nix") + ]; }; }; + }; } diff --git a/home/asakiyuki/configuration.nix b/home/asakiyuki/configuration.nix index 3c668f6..28f7b27 100644 --- a/home/asakiyuki/configuration.nix +++ b/home/asakiyuki/configuration.nix @@ -5,14 +5,12 @@ custom, unstable, ... -}: -let +}: let osconfig = config; -in -{ +in { users.users.asakiyuki = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = ["wheel"]; }; home-manager.users.asakiyuki = { @@ -25,6 +23,7 @@ in libs ; }; + imports = [ ./programs.nix ./files.nix diff --git a/home/asakiyuki/files.nix b/home/asakiyuki/files.nix index 290bba9..5440dd7 100644 --- a/home/asakiyuki/files.nix +++ b/home/asakiyuki/files.nix @@ -4,25 +4,26 @@ osconfig, config, ... -}: -{ +}: { home.file = lib.mkMerge [ (builtins.mapAttrs (_: path: { - source = path; - }) osconfig.device.files.source) + source = path; + }) + osconfig.device.files.source) (builtins.mapAttrs (_: path: { - source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/${path}"; - }) osconfig.device.files.symlink) + source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/${path}"; + }) + osconfig.device.files.symlink) (lib.mkMerge ( - builtins.map (name: lib.setAttrByPath [ name "force" ] true) ( + builtins.map (name: lib.setAttrByPath [name "force"] true) ( builtins.attrNames osconfig.device.files.force ) )) (lib.mkMerge ( - builtins.map (name: lib.setAttrByPath [ name "force" ] (lib.mkForce true)) ( + builtins.map (name: lib.setAttrByPath [name "force"] (lib.mkForce true)) ( builtins.attrNames osconfig.device.files.mkForce ) )) @@ -30,26 +31,26 @@ xdg.configFile.kdeglobals = lib.mkIf (osconfig.device.wm.hyprland.enable || osconfig.device.wm.niri.enable) - { - text = ( - builtins.readFile ( - (pkgs.catppuccin-kde.override { - flavour = [ "mocha" ]; - accents = [ "sapphire" ]; - }) - + "/share/color-schemes/CatppuccinMochaSapphire.colors" - ) - + '' + { + text = ( + builtins.readFile ( + (pkgs.catppuccin-kde.override { + flavour = ["mocha"]; + accents = ["sapphire"]; + }) + + "/share/color-schemes/CatppuccinMochaSapphire.colors" + ) + + '' - [UiSettings] - ColorScheme=qt6ct + [UiSettings] + ColorScheme=qt6ct - [General] - TerminalApplication=${osconfig.device.programs.terminal.name} + [General] + TerminalApplication=${osconfig.device.programs.terminal.name} - [Icons] - Theme=Papirus - '' - ); - }; + [Icons] + Theme=Papirus + '' + ); + }; } diff --git a/home/asakiyuki/programs.nix b/home/asakiyuki/programs.nix index 98e5373..ce921d9 100644 --- a/home/asakiyuki/programs.nix +++ b/home/asakiyuki/programs.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ../../modules/features/home/ghostty.nix ../../modules/features/home/kitty.nix diff --git a/home/junko/configuration.nix b/home/junko/configuration.nix index 197fffd..c5ac96c 100644 --- a/home/junko/configuration.nix +++ b/home/junko/configuration.nix @@ -5,11 +5,9 @@ custom, unstable, ... -}: -let +}: let osconfig = config; -in -{ +in { users.users.junko = { isNormalUser = true; }; @@ -25,7 +23,7 @@ in ; }; - imports = [ ]; + imports = []; home = { username = "junko"; diff --git a/host/desktop/default.nix b/host/desktop/default.nix index 9d557f6..eff94de 100644 --- a/host/desktop/default.nix +++ b/host/desktop/default.nix @@ -3,9 +3,9 @@ custom, config, pkgs, + inputs, ... -}: -{ +}: { imports = [ ./programs.nix ./device.nix @@ -44,13 +44,14 @@ home-manager.users.asakiyuki = { home.pointerCursor = - (custom.cursors { - name = config.device.cursors; - size = 48; - }) - { pkgs = pkgs; }; + (custom.cursors { + name = config.device.cursors; + size = 48; + }) + {pkgs = pkgs;}; }; + nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; xdg.menus.enable = true; services.dbus.enable = true; } diff --git a/host/desktop/device.nix b/host/desktop/device.nix index aa7f19c..0ff53f4 100644 --- a/host/desktop/device.nix +++ b/host/desktop/device.nix @@ -3,11 +3,9 @@ libs, pkgs, ... -}: -let +}: let ENABLE_HDR = false; -in -{ +in { device = { flake-name = "ideapad-slim-5"; cursors = "aemeath"; @@ -62,10 +60,8 @@ in }; source = { - ".config/qt5ct/colors/Catppuccin-Mocha.conf" = - "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf"; - ".config/qt6ct/colors/Catppuccin-Mocha.conf" = - "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf"; + ".config/qt5ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf"; + ".config/qt6ct/colors/Catppuccin-Mocha.conf" = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf"; ".config/dolphinrc" = libs.root "/configs/dolphinrc"; diff --git a/host/desktop/programs.nix b/host/desktop/programs.nix index 756f4d1..89d08df 100644 --- a/host/desktop/programs.nix +++ b/host/desktop/programs.nix @@ -1,7 +1,4 @@ -{ - ... -}: -{ +{...}: { programs = { ffmpeg.enable = true; nodejs.enable = true; diff --git a/host/server/default.nix b/host/server/default.nix index 4a3df8d..77f414c 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -1,5 +1,4 @@ -{ libs, ... }: -{ +{libs, ...}: { imports = [ ./device.nix ./programs.nix diff --git a/host/server/device.nix b/host/server/device.nix index 20d4809..e4396c2 100644 --- a/host/server/device.nix +++ b/host/server/device.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { device = { flake-name = "home-server"; diff --git a/host/server/networking.nix b/host/server/networking.nix index 6dd4bfb..a01f1b8 100644 --- a/host/server/networking.nix +++ b/host/server/networking.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { networking = { firewall = { enable = true; diff --git a/host/server/programs.nix b/host/server/programs.nix index 5af6b25..a26218a 100644 --- a/host/server/programs.nix +++ b/host/server/programs.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { programs = { ffmpeg.enable = true; nodejs.enable = true; diff --git a/host/server/services.nix b/host/server/services.nix index 8bb1137..23e4c04 100644 --- a/host/server/services.nix +++ b/host/server/services.nix @@ -1,5 +1,4 @@ -{ libs, ... }: -{ +{libs, ...}: { imports = [ (libs.root "/modules/services/adguardhome.nix") (libs.root "/modules/services/cloudflare-dyndns.nix") diff --git a/libs/default.nix b/libs/default.nix index 1d9bb1b..e7d6e52 100644 --- a/libs/default.nix +++ b/libs/default.nix @@ -1,3 +1,3 @@ -{ ... }: { - root = path: ../. + path; -} \ No newline at end of file +{...}: { + root = path: ../. + path; +} diff --git a/modules/features/home/bash.nix b/modules/features/home/bash.nix index 3fbe4d0..ae362ff 100644 --- a/modules/features/home/bash.nix +++ b/modules/features/home/bash.nix @@ -1,68 +1,73 @@ -{ lib, osconfig, ... }: { - programs.bash = { - enable = true; - shellAliases = lib.attrsets.mergeAttrsList [ - { - cls = "clear"; - cleanup = "sudo nix-collect-garbage -d"; - cls-log = "sudo journalctl --vacuum-time=1s"; +{ + lib, + osconfig, + ... +}: { + programs.bash = { + enable = true; + shellAliases = lib.attrsets.mergeAttrsList [ + { + cls = "clear"; + cleanup = "sudo nix-collect-garbage -d"; + cls-log = "sudo journalctl --vacuum-time=1s"; - logout = "pkill -KILL -u $USER"; + logout = "pkill -KILL -u $USER"; - nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}"; - flake-upgrade = "nix flake update"; - } - { - spf = "superfile"; - } - (lib.optionalAttrs osconfig.virtualisation.waydroid.enable { - wss = "waydroid session stop; exit;"; - }) - ]; + nrs = "sudo nixos-rebuild switch --flake /etc/nixos#${osconfig.device.flake-name}"; + flake-upgrade = "nix flake update"; + } + { + spf = "superfile"; + } + (lib.optionalAttrs osconfig.virtualisation.waydroid.enable { + wss = "waydroid session stop; exit;"; + }) + ]; - shellOptions = [ - "histappend" - "checkwinsize" - "extglob" - "globstar" - "checkjobs" - "autocd" - ]; + shellOptions = [ + "histappend" + "checkwinsize" + "extglob" + "globstar" + "checkjobs" + "autocd" + ]; - initExtra = '' - function git-commit() { - git add . - git commit -m "$1" - } + initExtra = + '' + function git-commit() { + git add . + git commit -m "$1" + } - function git-push() { - git-commit "$1" - git push origin HEAD - } + function git-push() { + git-commit "$1" + git push origin HEAD + } - function git-pull() { - git fetch origin HEAD - git pull origin HEAD - } + function git-pull() { + git fetch origin HEAD + git pull origin HEAD + } - function get-hash() { - nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$1") - } - '' + - lib.optionalString osconfig.device.programs.tmux.enable '' - allowed_terms=("xterm-kitty" "xterm-ghostty") + function get-hash() { + nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "$1") + } + '' + + lib.optionalString osconfig.device.programs.tmux.enable '' + allowed_terms=("xterm-kitty" "xterm-ghostty") - should_run_tmux=false - for term in "${"$" + "{allowed_terms[@]" + "}"}"; do - if [[ "$TERM" == "$term" ]]; then - should_run_tmux=true - break - fi - done + should_run_tmux=false + for term in "${"$" + "{allowed_terms[@]" + "}"}"; do + if [[ "$TERM" == "$term" ]]; then + should_run_tmux=true + break + fi + done - if [ -z "$TMUX" ] && [ "$should_run_tmux" = true ]; then - exec tmux - fi - ''; - }; -} \ No newline at end of file + if [ -z "$TMUX" ] && [ "$should_run_tmux" = true ]; then + exec tmux + fi + ''; + }; +} diff --git a/modules/features/home/browsers.nix b/modules/features/home/browsers.nix index e9ad3b5..8d7764b 100644 --- a/modules/features/home/browsers.nix +++ b/modules/features/home/browsers.nix @@ -1,5 +1,8 @@ -{ pkgs, libs, ... }: { + pkgs, + libs, + ... +}: { programs = { firefox.profiles.default = { settings = { @@ -138,7 +141,7 @@ mynixos = { name = "My NixOS"; - definedAliases = [ "@mynixos" ]; + definedAliases = ["@mynixos"]; icon = "https://mynixos.com/favicon.ico"; urls = [ { @@ -164,6 +167,6 @@ userContent = builtins.readFile (libs.root "/assets/firefox/userContent.css"); }; - chromium = { }; + chromium = {}; }; } diff --git a/modules/features/home/fastfetch.nix b/modules/features/home/fastfetch.nix index 57a8302..65c7896 100644 --- a/modules/features/home/fastfetch.nix +++ b/modules/features/home/fastfetch.nix @@ -1,5 +1,8 @@ -{ lib, osconfig, ... }: { + lib, + osconfig, + ... +}: { programs.fastfetch = lib.mkIf osconfig.device.programs.fastfetch.enable { enable = true; settings = { @@ -173,4 +176,3 @@ }; }; } - diff --git a/modules/features/home/ghostty.nix b/modules/features/home/ghostty.nix index 0b29b5d..c0ac6c0 100644 --- a/modules/features/home/ghostty.nix +++ b/modules/features/home/ghostty.nix @@ -1,54 +1,57 @@ -{ lib, osconfig, ... }: { + lib, + osconfig, + ... +}: { programs.ghostty = lib.mkIf - (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "ghostty") - { - enable = true; - settings = { - theme = "catppuccin-mocha"; + (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "ghostty") + { + enable = true; + settings = { + theme = "catppuccin-mocha"; - font-size = 10; - font-family = "SauceCodePro NFP Bold"; + font-size = 10; + font-family = "SauceCodePro NFP Bold"; - window-width = 230; - window-height = 68; + window-width = 230; + window-height = 68; - window-padding-x = 5; - window-padding-y = 0; + window-padding-x = 5; + window-padding-y = 0; - keybind = [ - "ctrl+shift+n=unbind" - "ctrl+shift+i=unbind" + keybind = [ + "ctrl+shift+n=unbind" + "ctrl+shift+i=unbind" + ]; + }; + + themes = { + catppuccin-mocha = { + background = "1e1e2e"; + cursor-color = "f5e0dc"; + foreground = "cdd6f4"; + palette = [ + "0=#45475a" + "1=#f38ba8" + "2=#a6e3a1" + "3=#f9e2af" + "4=#89b4fa" + "5=#f5c2e7" + "6=#94e2d5" + "7=#bac2de" + "8=#585b70" + "9=#f38ba8" + "10=#a6e3a1" + "11=#f9e2af" + "12=#89b4fa" + "13=#f5c2e7" + "14=#94e2d5" + "15=#a6adc8" ]; - }; - - themes = { - catppuccin-mocha = { - background = "1e1e2e"; - cursor-color = "f5e0dc"; - foreground = "cdd6f4"; - palette = [ - "0=#45475a" - "1=#f38ba8" - "2=#a6e3a1" - "3=#f9e2af" - "4=#89b4fa" - "5=#f5c2e7" - "6=#94e2d5" - "7=#bac2de" - "8=#585b70" - "9=#f38ba8" - "10=#a6e3a1" - "11=#f9e2af" - "12=#89b4fa" - "13=#f5c2e7" - "14=#94e2d5" - "15=#a6adc8" - ]; - selection-background = "353749"; - selection-foreground = "cdd6f4"; - }; + selection-background = "353749"; + selection-foreground = "cdd6f4"; }; }; + }; } diff --git a/modules/features/home/git.nix b/modules/features/home/git.nix index 93dad9b..15a2bac 100644 --- a/modules/features/home/git.nix +++ b/modules/features/home/git.nix @@ -1,19 +1,19 @@ -{ ... }: { - programs.git = { - enable = true; - settings = { - user = { - name = "Asaki Yuki"; - email = "vantrong2007vn@gmail.com"; - }; +{...}: { + programs.git = { + enable = true; + settings = { + user = { + name = "Asaki Yuki"; + email = "vantrong2007vn@gmail.com"; + }; - init = { - defaultBranch = "main"; - }; + init = { + defaultBranch = "main"; + }; - # pull = { - # rebase = ""; - # }; - }; + # pull = { + # rebase = ""; + # }; }; -} \ No newline at end of file + }; +} diff --git a/modules/features/home/kitty.nix b/modules/features/home/kitty.nix index 8225e23..06e1e9c 100644 --- a/modules/features/home/kitty.nix +++ b/modules/features/home/kitty.nix @@ -1,79 +1,82 @@ -{ lib, osconfig, ... }: { + lib, + osconfig, + ... +}: { programs.kitty = lib.mkIf - (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "kitty") - { - enable = true; + (osconfig.device.programs.terminal.enable && osconfig.device.programs.terminal.name == "kitty") + { + enable = true; - keybindings = { - "ctrl+c" = "copy_to_clipboard"; - "ctrl+v" = "paste_from_clipboard"; - }; - - settings = { - window_padding_width = 2; - window_padding_height = 2; - - cursor_shape = "beam"; - # background_opacity = 0.5; - - font_family = "Tahoma"; - font_size = 9; - - foreground = "#cdd6f4"; - background = "#1e1e2e"; - selection_foreground = "#1e1e2e"; - selection_background = "#f5e0dc"; - - cursor = "#f5e0dc"; - cursor_text_color = "#1e1e2e"; - - url_color = "#f5e0dc"; - - active_border_color = "#b4befe"; - inactive_border_color = "#6c7086"; - bell_border_color = "#f9e2af"; - - wayland_titlebar_color = "system"; - macos_titlebar_color = "system"; - - active_tab_foreground = "#11111b"; - active_tab_background = "#cba6f7"; - inactive_tab_foreground = "#cdd6f4"; - inactive_tab_background = "#181825"; - tab_bar_background = "#11111b"; - - mark1_foreground = "#1e1e2e"; - mark1_background = "#b4befe"; - mark2_foreground = "#1e1e2e"; - mark2_background = "#cba6f7"; - mark3_foreground = "#1e1e2e"; - mark3_background = "#74c7ec"; - - color0 = "#45475a"; - color8 = "#585b70"; - - color1 = "#f38ba8"; - color9 = "#f38ba8"; - - color2 = "#a6e3a1"; - color10 = "#a6e3a1"; - - color3 = "#f9e2af"; - color11 = "#f9e2af"; - - color4 = "#89b4fa"; - color12 = "#89b4fa"; - - color5 = "#f5c2e7"; - color13 = "#f5c2e7"; - - color6 = "#94e2d5"; - color14 = "#94e2d5"; - - color7 = "#bac2de"; - color15 = "#a6adc8"; - }; + keybindings = { + "ctrl+c" = "copy_to_clipboard"; + "ctrl+v" = "paste_from_clipboard"; }; + + settings = { + window_padding_width = 2; + window_padding_height = 2; + + cursor_shape = "beam"; + # background_opacity = 0.5; + + font_family = "Tahoma"; + font_size = 9; + + foreground = "#cdd6f4"; + background = "#1e1e2e"; + selection_foreground = "#1e1e2e"; + selection_background = "#f5e0dc"; + + cursor = "#f5e0dc"; + cursor_text_color = "#1e1e2e"; + + url_color = "#f5e0dc"; + + active_border_color = "#b4befe"; + inactive_border_color = "#6c7086"; + bell_border_color = "#f9e2af"; + + wayland_titlebar_color = "system"; + macos_titlebar_color = "system"; + + active_tab_foreground = "#11111b"; + active_tab_background = "#cba6f7"; + inactive_tab_foreground = "#cdd6f4"; + inactive_tab_background = "#181825"; + tab_bar_background = "#11111b"; + + mark1_foreground = "#1e1e2e"; + mark1_background = "#b4befe"; + mark2_foreground = "#1e1e2e"; + mark2_background = "#cba6f7"; + mark3_foreground = "#1e1e2e"; + mark3_background = "#74c7ec"; + + color0 = "#45475a"; + color8 = "#585b70"; + + color1 = "#f38ba8"; + color9 = "#f38ba8"; + + color2 = "#a6e3a1"; + color10 = "#a6e3a1"; + + color3 = "#f9e2af"; + color11 = "#f9e2af"; + + color4 = "#89b4fa"; + color12 = "#89b4fa"; + + color5 = "#f5c2e7"; + color13 = "#f5c2e7"; + + color6 = "#94e2d5"; + color14 = "#94e2d5"; + + color7 = "#bac2de"; + color15 = "#a6adc8"; + }; + }; } diff --git a/modules/features/home/neovide.nix b/modules/features/home/neovide.nix index 6d71add..cc64b6d 100644 --- a/modules/features/home/neovide.nix +++ b/modules/features/home/neovide.nix @@ -1,8 +1,8 @@ -{ ... }: { - programs.neovide = { - enable = true; - settings = { - neovim-bin = "/etc/profiles/per-user/asakiyuki/bin/nvim"; - }; +{...}: { + programs.neovide = { + enable = true; + settings = { + neovim-bin = "/etc/profiles/per-user/asakiyuki/bin/nvim"; }; -} \ No newline at end of file + }; +} diff --git a/modules/features/home/niri.nix b/modules/features/home/niri.nix index 5e99097..3e928c1 100644 --- a/modules/features/home/niri.nix +++ b/modules/features/home/niri.nix @@ -1,11 +1,15 @@ -{ osconfig, lib, ... }: { - programs.niri = lib.mkIf osconfig.device.wm.niri.enable { - enable = true; - settings = { - binds = { - # "Ctrl+Alt+T" = "ghostty"; - # "Mod+D" = "fuzzel"; - }; - }; +{ + osconfig, + lib, + ... +}: { + programs.niri = lib.mkIf osconfig.device.wm.niri.enable { + enable = true; + settings = { + binds = { + # "Ctrl+Alt+T" = "ghostty"; + # "Mod+D" = "fuzzel"; + }; }; -} \ No newline at end of file + }; +} diff --git a/modules/features/home/obs-studio.nix b/modules/features/home/obs-studio.nix index 5ac8cac..a49e57f 100644 --- a/modules/features/home/obs-studio.nix +++ b/modules/features/home/obs-studio.nix @@ -1,5 +1,11 @@ -{ pkgs, custom, lib, osconfig, ... }: +{ + pkgs, + custom, + lib, + osconfig, + ... +}: lib.mkIf osconfig.device.programs.obs-studio.enable { - programs.obs-studio.enable = true; - home.file.".config/obs-studio/themes".source = pkgs.callPackage custom.catppuccin-obs { }; -} \ No newline at end of file + programs.obs-studio.enable = true; + home.file.".config/obs-studio/themes".source = pkgs.callPackage custom.catppuccin-obs {}; +} diff --git a/modules/features/home/packages.nix b/modules/features/home/packages.nix index dbea11e..22a02f0 100644 --- a/modules/features/home/packages.nix +++ b/modules/features/home/packages.nix @@ -1,33 +1,32 @@ { - pkgs, lib, config, osconfig, - inputs, ... -}: -{ - home.packages = [ - (lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package) +}: { + home.packages = + [ + (lib.mkIf config.programs.catppuccin.enable config.programs.catppuccin.package) - (lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package) - (lib.mkIf config.programs.prismlauncher.enable config.programs.prismlauncher.package) - (lib.mkIf config.programs.vlc.enable config.programs.vlc.package) - (lib.mkIf config.programs.gimp.enable config.programs.gimp.package) - (lib.mkIf config.programs.libreoffice.enable config.programs.libreoffice.package) - (lib.mkIf config.programs.osu.enable config.programs.osu.package) - (lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package) - (lib.mkIf config.programs.blender.enable config.programs.blender.package) - (lib.mkIf config.programs.xprop.enable config.programs.xprop.package) + (lib.mkIf config.programs.antigravity.enable config.programs.antigravity.package) + (lib.mkIf config.programs.prismlauncher.enable config.programs.prismlauncher.package) + (lib.mkIf config.programs.vlc.enable config.programs.vlc.package) + (lib.mkIf config.programs.gimp.enable config.programs.gimp.package) + (lib.mkIf config.programs.libreoffice.enable config.programs.libreoffice.package) + (lib.mkIf config.programs.osu.enable config.programs.osu.package) + (lib.mkIf config.programs.lmstudio.enable config.programs.lmstudio.package) + (lib.mkIf config.programs.blender.enable config.programs.blender.package) + (lib.mkIf config.programs.xprop.enable config.programs.xprop.package) - (lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package) - (lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package) + (lib.mkIf config.programs.pavucontrol.enable config.programs.pavucontrol.package) + (lib.mkIf config.programs.nwg-look.enable config.programs.nwg-look.package) - (lib.mkIf config.programs.hytale.enable config.programs.hytale.package) - (lib.mkIf ( - config.programs.cider.enable && osconfig.device.programs.cider-2.enable - ) config.programs.cider.package) - ] - ++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages) - ++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages); + (lib.mkIf config.programs.hytale.enable config.programs.hytale.package) + (lib.mkIf ( + config.programs.cider.enable && osconfig.device.programs.cider-2.enable + ) + config.programs.cider.package) + ] + ++ (lib.optionals config.programs.proton-ge.enable config.programs.proton-ge.packages) + ++ (lib.optionals config.programs.proton-apps.enable config.programs.proton-apps.packages); } diff --git a/modules/features/home/starship.nix b/modules/features/home/starship.nix index 4743be5..d6e8121 100644 --- a/modules/features/home/starship.nix +++ b/modules/features/home/starship.nix @@ -1,4 +1,8 @@ -{ lib, osconfig, ... }: { +{ + lib, + osconfig, + ... +}: { programs.starship = lib.mkIf osconfig.device.programs.starship.enable { enable = true; settings = { diff --git a/modules/features/home/theme.nix b/modules/features/home/theme.nix index 3437164..54b76f5 100644 --- a/modules/features/home/theme.nix +++ b/modules/features/home/theme.nix @@ -1,41 +1,43 @@ -{ pkgs, lib, ... }: -let - catppuccin-gtk = pkgs.catppuccin-gtk.override { - variant = "mocha"; - accents = [ "sapphire" ]; - size = "compact"; - }; -in { - home.activation.copyGtkTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - mkdir -p "$HOME/.themes/" + pkgs, + lib, + ... +}: let + catppuccin-gtk = pkgs.catppuccin-gtk.override { + variant = "mocha"; + accents = ["sapphire"]; + size = "compact"; + }; +in { + home.activation.copyGtkTheme = lib.hm.dag.entryAfter ["writeBoundary"] '' + mkdir -p "$HOME/.themes/" - if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact" ]; then - cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact" "$HOME/.themes/" - fi + if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact" ]; then + cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact" "$HOME/.themes/" + fi - if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-hdpi" ]; then - cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-hdpi" "$HOME/.themes/" - fi + if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-hdpi" ]; then + cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-hdpi" "$HOME/.themes/" + fi - if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-xhdpi" ]; then - cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-xhdpi" "$HOME/.themes/" - fi - ''; + if [ ! -d "$HOME/.themes/catppuccin-mocha-sapphire-compact-xhdpi" ]; then + cp -r "${catppuccin-gtk}/share/themes/catppuccin-mocha-sapphire-compact-xhdpi" "$HOME/.themes/" + fi + ''; - # QT - qt = { - enable = true; - platformTheme.name = "qtct"; - style = { - package = with pkgs; [ - catppuccin-qt5ct - catppuccin-kde - kdePackages.breeze - ]; - }; + # QT + qt = { + enable = true; + platformTheme.name = "qtct"; + style = { + package = with pkgs; [ + catppuccin-qt5ct + catppuccin-kde + kdePackages.breeze + ]; }; + }; - # GTK - gtk.theme.name = "catppuccin-mocha-sapphire-compact"; -} \ No newline at end of file + # GTK + gtk.theme.name = "catppuccin-mocha-sapphire-compact"; +} diff --git a/modules/features/home/tmux.nix b/modules/features/home/tmux.nix index 1a2b2c0..ae8d93d 100644 --- a/modules/features/home/tmux.nix +++ b/modules/features/home/tmux.nix @@ -1,5 +1,9 @@ -{ lib, osconfig, pkgs, ... }: -let +{ + lib, + osconfig, + pkgs, + ... +}: let TOP_PANEL = '' set -g pane-border-status top set -g pane-border-lines single @@ -20,7 +24,7 @@ let BOTTOM_PANEL = '' set -g status-justify "centre" - + set -g window-status-format "#{E:@asa-module-icon} #I #{E:@asa-module-text} #W " set -g window-status-current-format "#{E:@asa-module-icon} #I #{E:@asa-module-text} #W " @@ -53,8 +57,7 @@ let bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel ''; -in -{ +in { programs.tmux = lib.mkIf osconfig.device.programs.tmux.enable { enable = true; keyMode = "vi"; diff --git a/modules/features/home/vscode.nix b/modules/features/home/vscode.nix index a5af7c9..249ccdc 100644 --- a/modules/features/home/vscode.nix +++ b/modules/features/home/vscode.nix @@ -1,5 +1,4 @@ -{ unstable, ... }: -{ +{unstable, ...}: { programs.vscode = { enable = true; package = unstable.vscode; diff --git a/modules/features/home/xdg.nix b/modules/features/home/xdg.nix index 1eb7cd0..d3d1341 100644 --- a/modules/features/home/xdg.nix +++ b/modules/features/home/xdg.nix @@ -1,14 +1,19 @@ -{ pkgs, lib, osconfig, ... }: { - xdg.portal = lib.mkIf osconfig.device.wm.hyprland.enable { - enable = true; - xdgOpenUsePortal = true; - config = { - common.default = ["gtk"]; - hyprland.default = ["gtk" "hyprland"]; - }; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-hyprland - ]; +{ + pkgs, + lib, + osconfig, + ... +}: { + xdg.portal = lib.mkIf osconfig.device.wm.hyprland.enable { + enable = true; + xdgOpenUsePortal = true; + config = { + common.default = ["gtk"]; + hyprland.default = ["gtk" "hyprland"]; }; -} \ No newline at end of file + extraPortals = [ + pkgs.xdg-desktop-portal-gtk + pkgs.xdg-desktop-portal-hyprland + ]; + }; +} diff --git a/modules/features/system/boot.nix b/modules/features/system/boot.nix index f19f953..e339853 100644 --- a/modules/features/system/boot.nix +++ b/modules/features/system/boot.nix @@ -1,24 +1,29 @@ -{ inputs, pkgs, libs, ... }: let - background = libs.root "/assets/grub/background.png"; - baseTheme = inputs.honkai-railway-grub-theme.packages.${pkgs.stdenv.hostPlatform.system}.cyrene-grub-theme; +{ + inputs, + pkgs, + libs, + ... +}: let + background = libs.root "/assets/grub/background.png"; + baseTheme = inputs.honkai-railway-grub-theme.packages.${pkgs.stdenv.hostPlatform.system}.cyrene-grub-theme; in { - boot = { - loader = { - efi.canTouchEfiVariables = true; + boot = { + loader = { + efi.canTouchEfiVariables = true; - grub = rec { - enable = true; - device = "nodev"; - efiSupport = true; - useOSProber = true; - splashImage = background; - theme = pkgs.runCommand "my-grub-theme" { } '' - mkdir -p $out - cp -r ${baseTheme}/* $out/ - chmod -R u+w $out - cp ${background} $out/background.png - ''; - }; - }; + grub = { + enable = true; + device = "nodev"; + efiSupport = true; + useOSProber = true; + splashImage = background; + theme = pkgs.runCommand "my-grub-theme" {} '' + mkdir -p $out + cp -r ${baseTheme}/* $out/ + chmod -R u+w $out + cp ${background} $out/background.png + ''; + }; }; -} \ No newline at end of file + }; +} diff --git a/modules/features/system/cloudflare.nix b/modules/features/system/cloudflare.nix index c838380..db418c9 100644 --- a/modules/features/system/cloudflare.nix +++ b/modules/features/system/cloudflare.nix @@ -1,5 +1,5 @@ -{ ... }: { - services = { - cloudflare-warp.enable = true; - }; -} \ No newline at end of file +{...}: { + services = { + cloudflare-warp.enable = true; + }; +} diff --git a/modules/features/system/dconf.nix b/modules/features/system/dconf.nix index 1640805..bf1452c 100644 --- a/modules/features/system/dconf.nix +++ b/modules/features/system/dconf.nix @@ -1,6 +1,11 @@ -{ lib, config, pkgs, ... }: { - programs.dconf.enable = true; - environment.systemPackages = lib.optionals config.programs.dconf.enable [ - pkgs.glib - ]; -} \ No newline at end of file +{ + lib, + config, + pkgs, + ... +}: { + programs.dconf.enable = true; + environment.systemPackages = lib.optionals config.programs.dconf.enable [ + pkgs.glib + ]; +} diff --git a/modules/features/system/docker.nix b/modules/features/system/docker.nix index 2f929eb..2c11b90 100644 --- a/modules/features/system/docker.nix +++ b/modules/features/system/docker.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { virtualisation.docker = { enable = true; }; diff --git a/modules/features/system/flatpak.nix b/modules/features/system/flatpak.nix index b362b71..22fe6cb 100644 --- a/modules/features/system/flatpak.nix +++ b/modules/features/system/flatpak.nix @@ -1,5 +1,9 @@ -{ lib, config, ... }: { - services.flatpak = lib.mkIf config.device.flatpak.enable { - enable = true; - }; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + services.flatpak = lib.mkIf config.device.flatpak.enable { + enable = true; + }; +} diff --git a/modules/features/system/gdm.nix b/modules/features/system/gdm.nix index 4583e78..f897a85 100644 --- a/modules/features/system/gdm.nix +++ b/modules/features/system/gdm.nix @@ -1,5 +1,6 @@ -{ lib, config, ... }: { - services = lib.mkIf config.device.dm.gdm.enable { - displayManager.gdm.enable = true; - }; -} \ No newline at end of file +{ lib, config, ... }: +{ + services = lib.mkIf config.device.dm.gdm.enable { + displayManager.gdm.enable = true; + }; +} diff --git a/modules/features/system/gnome.nix b/modules/features/system/gnome.nix index b434dea..0a219c1 100644 --- a/modules/features/system/gnome.nix +++ b/modules/features/system/gnome.nix @@ -1,5 +1,9 @@ -{ lib, config, ... }: { - services = lib.mkIf config.device.de.gnome.enable { - desktopManager.gnome.enable = true; - }; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + services = lib.mkIf config.device.de.gnome.enable { + desktopManager.gnome.enable = true; + }; +} diff --git a/modules/features/system/hyprland.nix b/modules/features/system/hyprland.nix index 8500ce4..3be2d1f 100644 --- a/modules/features/system/hyprland.nix +++ b/modules/features/system/hyprland.nix @@ -1,5 +1,9 @@ -{ lib, config, ... }: { - programs.hyprland = lib.mkIf config.device.wm.hyprland.enable { - enable = true; - }; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + programs.hyprland = lib.mkIf config.device.wm.hyprland.enable { + enable = true; + }; +} diff --git a/modules/features/system/input-method.nix b/modules/features/system/input-method.nix index c2ca486..5441220 100644 --- a/modules/features/system/input-method.nix +++ b/modules/features/system/input-method.nix @@ -1,10 +1,10 @@ -{ pkgs, ... }: { - i18n.inputMethod = { - enable = true; - type = "fcitx5"; - fcitx5.addons = with pkgs; [ - # fcitx5-bamboo - kdePackages.fcitx5-unikey - ]; - }; -} \ No newline at end of file +{pkgs, ...}: { + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + # fcitx5-bamboo + kdePackages.fcitx5-unikey + ]; + }; +} diff --git a/modules/features/system/kde-plasma.nix b/modules/features/system/kde-plasma.nix index b615e2e..a2b3b59 100644 --- a/modules/features/system/kde-plasma.nix +++ b/modules/features/system/kde-plasma.nix @@ -1,6 +1,10 @@ -{ lib, config, ... }: { - services = lib.mkIf config.device.de.kdePlasma.enable { - desktopManager.plasma6.enable = true; - xserver.enable = true; - }; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + services = lib.mkIf config.device.de.kdePlasma.enable { + desktopManager.plasma6.enable = true; + xserver.enable = true; + }; +} diff --git a/modules/features/system/niri.nix b/modules/features/system/niri.nix index 8928447..61060a9 100644 --- a/modules/features/system/niri.nix +++ b/modules/features/system/niri.nix @@ -1,4 +1,8 @@ -{ lib, config, ... }: { - programs.niri.enable = lib.mkIf config.device.wm.niri.enable true; - services.xserver.enable = lib.mkIf config.device.wm.niri.enable true; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + programs.niri.enable = lib.mkIf config.device.wm.niri.enable true; + services.xserver.enable = lib.mkIf config.device.wm.niri.enable true; +} diff --git a/modules/features/system/nix-dl.nix b/modules/features/system/nix-dl.nix index a43a7a7..f893177 100644 --- a/modules/features/system/nix-dl.nix +++ b/modules/features/system/nix-dl.nix @@ -1,14 +1,14 @@ -{ pkgs, ... }: { - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - stdenv.cc.cc - zlib - brotli - unixODBC - zstd - glib - stdenv.cc.cc.lib - ]; - }; -} \ No newline at end of file +{pkgs, ...}: { + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ + stdenv.cc.cc + zlib + brotli + unixODBC + zstd + glib + stdenv.cc.cc.lib + ]; + }; +} diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index b728c90..f9010f8 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -3,10 +3,8 @@ lib, config, ... -}: -{ - environment.systemPackages = - with pkgs; +}: { + environment.systemPackages = with pkgs; [ git vim @@ -15,7 +13,7 @@ tree nixd - nixfmt + alejandra zip unzip @@ -35,8 +33,9 @@ ++ (lib.optionals config.programs.gcc.enable config.programs.gcc.packages) ++ (lib.optionals config.programs.winepackages.enable config.programs.winepackages.packages) ++ (lib.optionals config.programs.kde-packages.enable config.programs.kde-packages.packages) - ++ (lib.optionals config.programs.r-tensorflow.enable [ config.programs.r-tensorflow.package ]) + ++ (lib.optionals config.programs.r-tensorflow.enable [config.programs.r-tensorflow.package]) ++ (lib.optionals ( - config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable - ) config.programs.hyprland-portals.packages); + config.programs.hyprland-portals.enable && config.device.wm.hyprland.enable + ) + config.programs.hyprland-portals.packages); } diff --git a/modules/features/system/sddm.nix b/modules/features/system/sddm.nix index 8cd7fd7..983a482 100644 --- a/modules/features/system/sddm.nix +++ b/modules/features/system/sddm.nix @@ -1,24 +1,29 @@ -{ pkgs, lib, config, ... }: let - custom-sddm-astronaut = pkgs.sddm-astronaut.override { - embeddedTheme = config.device.dm.sddm.theme; - }; +{ + pkgs, + lib, + config, + ... +}: let + custom-sddm-astronaut = pkgs.sddm-astronaut.override { + embeddedTheme = config.device.dm.sddm.theme; + }; in { - services.displayManager.sddm = lib.mkIf config.device.dm.sddm.enable { - enable = true; - wayland.enable = true; - extraPackages = with pkgs; [ - custom-sddm-astronaut - ]; - theme = "sddm-astronaut-theme"; - settings = { - Theme = { - Current = "sddm-astronaut-theme"; - }; - }; - }; - - environment.systemPackages = with pkgs; [ - custom-sddm-astronaut - kdePackages.qtmultimedia + services.displayManager.sddm = lib.mkIf config.device.dm.sddm.enable { + enable = true; + wayland.enable = true; + extraPackages = [ + custom-sddm-astronaut ]; -} \ No newline at end of file + theme = "sddm-astronaut-theme"; + settings = { + Theme = { + Current = "sddm-astronaut-theme"; + }; + }; + }; + + environment.systemPackages = with pkgs; [ + custom-sddm-astronaut + kdePackages.qtmultimedia + ]; +} diff --git a/modules/features/system/steam.nix b/modules/features/system/steam.nix index 8329534..d9300cc 100644 --- a/modules/features/system/steam.nix +++ b/modules/features/system/steam.nix @@ -1,5 +1,9 @@ -{ lib, config, ... }: { - programs.steam = lib.mkIf config.device.programs.steam.enable { - enable = true; - }; -} \ No newline at end of file +{ + lib, + config, + ... +}: { + programs.steam = lib.mkIf config.device.programs.steam.enable { + enable = true; + }; +} diff --git a/modules/features/system/udisks2.nix b/modules/features/system/udisks2.nix index 4b43bd7..86e584d 100644 --- a/modules/features/system/udisks2.nix +++ b/modules/features/system/udisks2.nix @@ -1,5 +1,5 @@ -{ ... }: { - services.udisks2 = { - enable = true; - }; -} \ No newline at end of file +{...}: { + services.udisks2 = { + enable = true; + }; +} diff --git a/modules/features/system/upower.nix b/modules/features/system/upower.nix index b9bb6f5..de3ace5 100644 --- a/modules/features/system/upower.nix +++ b/modules/features/system/upower.nix @@ -1,5 +1,5 @@ -{ ... }: { - services.upower = { - enable = true; - }; -} \ No newline at end of file +{...}: { + services.upower = { + enable = true; + }; +} diff --git a/modules/features/system/waydroid.nix b/modules/features/system/waydroid.nix index c48a046..a24d629 100644 --- a/modules/features/system/waydroid.nix +++ b/modules/features/system/waydroid.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: { - virtualisation.waydroid = { - enable = true; - package = pkgs.waydroid-nftables; - }; +{ + pkgs, + lib, + config, + ... +}: { + virtualisation.waydroid = { + enable = true; + package = pkgs.waydroid-nftables; + }; - environment.systemPackages = lib.optionals config.virtualisation.waydroid.enable [ - pkgs.waydroid-helper - ]; -} \ No newline at end of file + environment.systemPackages = lib.optionals config.virtualisation.waydroid.enable [ + pkgs.waydroid-helper + ]; +} diff --git a/modules/fonts.nix b/modules/fonts.nix index 315ae1f..8ce7eeb 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let fetch-fonts = { segoe-ui = { light = pkgs.fetchurl { @@ -62,8 +61,7 @@ let ''; }; }; -in -{ +in { fonts.enableDefaultPackages = true; fonts.packages = with pkgs; [ custom.tahoma @@ -83,4 +81,4 @@ in dina-font proggyfonts ]; -} \ No newline at end of file +} diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix index 53cedb6..ab60377 100644 --- a/modules/hardware/bluetooth.nix +++ b/modules/hardware/bluetooth.nix @@ -1,3 +1,3 @@ -{ config, ... }: { - hardware.bluetooth.enable = config.device.bluetooth.enable; -} \ No newline at end of file +{config, ...}: { + hardware.bluetooth.enable = config.device.bluetooth.enable; +} diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index dd6ae6f..f04797e 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -1,6 +1,5 @@ -{ ... }: -{ - imports = [ - ./bluetooth.nix - ]; -} \ No newline at end of file +{...}: { + imports = [ + ./bluetooth.nix + ]; +} diff --git a/modules/home-manager.nix b/modules/home-manager.nix index b3c526a..52728ac 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -1,7 +1,7 @@ -{ ... }: { - home-manager = { - useUserPackages = true; - useGlobalPkgs = true; - backupFileExtension = "bak"; - }; -} \ No newline at end of file +{...}: { + home-manager = { + useUserPackages = true; + useGlobalPkgs = true; + backupFileExtension = "bak"; + }; +} diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 9a327a0..1618df8 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -1,5 +1,8 @@ -{ lib, osconfig, ... }: { + lib, + osconfig, + ... +}: { imports = [ ./settings/default.nix ]; @@ -9,4 +12,3 @@ xwayland.enable = true; }; } - diff --git a/modules/programs/hyprland/settings/default.nix b/modules/programs/hyprland/settings/default.nix index 9071b10..9047bd8 100644 --- a/modules/programs/hyprland/settings/default.nix +++ b/modules/programs/hyprland/settings/default.nix @@ -1,5 +1,4 @@ -{ osconfig, ... }: -{ +{osconfig, ...}: { imports = [ ./key-bind.nix ./theme.nix @@ -12,4 +11,3 @@ monitorv2 = osconfig.device.wm.hyprland.monitors; }; } - diff --git a/modules/programs/hyprland/settings/exec.nix b/modules/programs/hyprland/settings/exec.nix index 7b6050a..96ae0ef 100644 --- a/modules/programs/hyprland/settings/exec.nix +++ b/modules/programs/hyprland/settings/exec.nix @@ -1,8 +1,6 @@ -{ ... }: -{ +{...}: { wayland.windowManager.hyprland.settings.exec-once = [ "quickshell" "fcitx5" ]; } - diff --git a/modules/programs/hyprland/settings/input.nix b/modules/programs/hyprland/settings/input.nix index d46fdd7..6e4f781 100644 --- a/modules/programs/hyprland/settings/input.nix +++ b/modules/programs/hyprland/settings/input.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { wayland.windowManager.hyprland.settings = { "$LAPTOP_TOUCHPAD_ENABLE" = false; diff --git a/modules/programs/hyprland/settings/key-bind.nix b/modules/programs/hyprland/settings/key-bind.nix index 0208a6f..610c2ce 100644 --- a/modules/programs/hyprland/settings/key-bind.nix +++ b/modules/programs/hyprland/settings/key-bind.nix @@ -1,68 +1,73 @@ -{ osconfig, config, ... }: { + osconfig, + config, + ... +}: { wayland.windowManager.hyprland.settings = { - bind = [ - "CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}" + bind = + [ + "CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}" - "SUPER SHIFT, L, exit," - "SUPER SHIFT, TAB, togglefloating," - "SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z" - "SUPER, J, togglesplit," - "SUPER, E, exec, dolphin" + "SUPER SHIFT, L, exit," + "SUPER SHIFT, TAB, togglefloating," + "SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z" + "SUPER, J, togglesplit," + "SUPER, E, exec, dolphin" - "SUPER, C, killactive" + "SUPER, C, killactive" - "SUPER SHIFT, LEFT, resizeactive, -25 0" - "SUPER SHIFT, RIGHT, resizeactive, 25 0" - "SUPER SHIFT, UP, resizeactive, 0 -25" - "SUPER SHIFT, DOWN, resizeactive, 0 25" + "SUPER SHIFT, LEFT, resizeactive, -25 0" + "SUPER SHIFT, RIGHT, resizeactive, 25 0" + "SUPER SHIFT, UP, resizeactive, 0 -25" + "SUPER SHIFT, DOWN, resizeactive, 0 25" - "SUPER, LEFT, movefocus, l" - "SUPER, RIGHT, movefocus, r" - "SUPER, UP, movefocus, u" - "SUPER, DOWN, movefocus, d" + "SUPER, LEFT, movefocus, l" + "SUPER, RIGHT, movefocus, r" + "SUPER, UP, movefocus, u" + "SUPER, DOWN, movefocus, d" - "SUPER CTRL, LEFT, movewindow, l" - "SUPER CTRL, RIGHT, movewindow, r" - "SUPER CTRL, UP, movewindow, u" - "SUPER CTRL, DOWN, movewindow, d" + "SUPER CTRL, LEFT, movewindow, l" + "SUPER CTRL, RIGHT, movewindow, r" + "SUPER CTRL, UP, movewindow, u" + "SUPER CTRL, DOWN, movewindow, d" - "SUPER SHIFT, h, resizeactive, -25 0" - "SUPER SHIFT, l, resizeactive, 25 0" - "SUPER SHIFT, k, resizeactive, 0 -25" - "SUPER SHIFT, j, resizeactive, 0 25" + "SUPER SHIFT, h, resizeactive, -25 0" + "SUPER SHIFT, l, resizeactive, 25 0" + "SUPER SHIFT, k, resizeactive, 0 -25" + "SUPER SHIFT, j, resizeactive, 0 25" - "SUPER, h, movefocus, l" - "SUPER, l, movefocus, r" - "SUPER, k, movefocus, u" - "SUPER, j, movefocus, d" + "SUPER, h, movefocus, l" + "SUPER, l, movefocus, r" + "SUPER, k, movefocus, u" + "SUPER, j, movefocus, d" - "SUPER CTRL, h, movewindow, l" - "SUPER CTRL, l, movewindow, r" - "SUPER CTRL, k, movewindow, u" - "SUPER CTRL, j, movewindow, d" + "SUPER CTRL, h, movewindow, l" + "SUPER CTRL, l, movewindow, r" + "SUPER CTRL, k, movewindow, u" + "SUPER CTRL, j, movewindow, d" - "SUPER, TAB, workspace, e+1" - "SUPER ALT, TAB, workspace, e-1" - "SUPER, MOUSE_DOWN, workspace, e-1" - "SUPER, MOUSE_UP, workspace, e+1" + "SUPER, TAB, workspace, e+1" + "SUPER ALT, TAB, workspace, e-1" + "SUPER, MOUSE_DOWN, workspace, e-1" + "SUPER, MOUSE_UP, workspace, e+1" - ", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle" - "ALT, SPACE, global, asakiyuki:launcher" + ", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle" + "ALT, SPACE, global, asakiyuki:launcher" - ",XF86MonBrightnessDown, exec, brightnessctl s 5%-" - ",XF86MonBrightnessUp, exec, brightnessctl s +5%" - ] - ++ builtins.concatLists ( - builtins.genList (i: [ - "SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}" - "SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}" - ]) 9 - ) - ++ [ - "SUPER, 0, workspace, 10" - "SUPER SHIFT, 0, movetoworkspace, 10" - ]; + ",XF86MonBrightnessDown, exec, brightnessctl s 5%-" + ",XF86MonBrightnessUp, exec, brightnessctl s +5%" + ] + ++ builtins.concatLists ( + builtins.genList (i: [ + "SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}" + "SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}" + ]) + 9 + ) + ++ [ + "SUPER, 0, workspace, 10" + "SUPER SHIFT, 0, movetoworkspace, 10" + ]; bindi = [ ", Caps_Lock, global, asakiyuki:capslock" diff --git a/modules/programs/hyprland/settings/theme.nix b/modules/programs/hyprland/settings/theme.nix index d687b60..fbd036a 100644 --- a/modules/programs/hyprland/settings/theme.nix +++ b/modules/programs/hyprland/settings/theme.nix @@ -1,58 +1,58 @@ -{ ... }: { - wayland.windowManager.hyprland.settings = { - general = { - gaps_in = 5; - gaps_out = 10; - border_size = 1; - "col.active_border" = "rgb(cdd6f4)"; - "col.inactive_border" = "rgb(7f849c)"; - allow_tearing = true; - resize_on_border = true; - }; - - decoration = { - rounding = 5; - rounding_power = 5; - active_opacity = 1; - inactive_opacity = 1; - - blur = { - enabled = true; - size = 2; - passes = 5; - vibrancy = 3; - }; - }; - - animations = { - enabled = "yes"; - - bezier = [ - "overshot, 0.05, 0.9, 0.1, 1.1" - "md3_decel, 0.05, 0.7, 0.1, 1" - ]; - - animation = [ - "windows, 1, 3, overshot, popin 60%" - "border, 1, 10, default" - "fade, 1, 2, default" - "workspaces, 1, 3.5, overshot, slidefade 15%" - "specialWorkspace, 1, 3, md3_decel, slidevert" - ]; - }; - - dwindle = { - pseudotile = true; - preserve_split = true; - }; - - master = { - new_status = "master"; - }; - - misc = { - force_default_wallpaper = 1; - disable_hyprland_logo = true; - }; +{...}: { + wayland.windowManager.hyprland.settings = { + general = { + gaps_in = 5; + gaps_out = 10; + border_size = 1; + "col.active_border" = "rgb(cdd6f4)"; + "col.inactive_border" = "rgb(7f849c)"; + allow_tearing = true; + resize_on_border = true; }; -} \ No newline at end of file + + decoration = { + rounding = 5; + rounding_power = 5; + active_opacity = 1; + inactive_opacity = 1; + + blur = { + enabled = true; + size = 2; + passes = 5; + vibrancy = 3; + }; + }; + + animations = { + enabled = "yes"; + + bezier = [ + "overshot, 0.05, 0.9, 0.1, 1.1" + "md3_decel, 0.05, 0.7, 0.1, 1" + ]; + + animation = [ + "windows, 1, 3, overshot, popin 60%" + "border, 1, 10, default" + "fade, 1, 2, default" + "workspaces, 1, 3.5, overshot, slidefade 15%" + "specialWorkspace, 1, 3, md3_decel, slidevert" + ]; + }; + + dwindle = { + pseudotile = true; + preserve_split = true; + }; + + master = { + new_status = "master"; + }; + + misc = { + force_default_wallpaper = 1; + disable_hyprland_logo = true; + }; + }; +} diff --git a/modules/programs/hyprland/settings/window-rules.nix b/modules/programs/hyprland/settings/window-rules.nix index 13902c6..2730b08 100644 --- a/modules/programs/hyprland/settings/window-rules.nix +++ b/modules/programs/hyprland/settings/window-rules.nix @@ -1,12 +1,11 @@ -{ ... }: -{ +{...}: { wayland.windowManager.hyprland.settings.windowrule = [ - "float, class:(clipse)" - "size 622 652, class:(clipse)" - "stayfocused, class:(clipse)" + "float, class:(clipse)" + "size 622 652, class:(clipse)" + "stayfocused, class:(clipse)" - "suppressevent maximize, class:.*" - "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" + "suppressevent maximize, class:.*" + "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" "opacity 0.0 override, class:^(xwaylandvideobridge)$" "noanim, class:^(xwaylandvideobridge)$" @@ -19,4 +18,3 @@ "tile, class:^(Chromium)$" ]; } - diff --git a/modules/programs/nixcord/default.nix b/modules/programs/nixcord/default.nix index 248bab7..cc315b6 100644 --- a/modules/programs/nixcord/default.nix +++ b/modules/programs/nixcord/default.nix @@ -1,5 +1,9 @@ -{ lib, libs, osconfig, ... }: { + lib, + libs, + osconfig, + ... +}: { programs.nixcord = lib.mkIf osconfig.device.programs.nixcord.enable { enable = true; discord = { @@ -12,7 +16,7 @@ config = { useQuickCss = true; enableReactDevtools = true; - themeLinks = [ "https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css" ]; + themeLinks = ["https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css"]; plugins = { BlurNSFW.enable = true; @@ -44,4 +48,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/modules/programs/nixvim/_nixvim.nix b/modules/programs/nixvim/_nixvim.nix index f3182af..836c158 100644 --- a/modules/programs/nixvim/_nixvim.nix +++ b/modules/programs/nixvim/_nixvim.nix @@ -1,5 +1,4 @@ -{ pkgs, config, ... }: -{ +{...}: { programs.nixvim.imports = [ ./default.nix ./extra-packages.nix diff --git a/modules/programs/nixvim/default.nix b/modules/programs/nixvim/default.nix index dc1e7ec..44adfa4 100644 --- a/modules/programs/nixvim/default.nix +++ b/modules/programs/nixvim/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { enable = true; vimdiffAlias = true; colorschemes.catppuccin.enable = true; @@ -17,4 +16,3 @@ clipboard = "unnamedplus"; }; } - diff --git a/modules/programs/nixvim/extra-packages.nix b/modules/programs/nixvim/extra-packages.nix index 1951aa8..bf9c523 100644 --- a/modules/programs/nixvim/extra-packages.nix +++ b/modules/programs/nixvim/extra-packages.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { extraPackages = with pkgs; [ nodePackages.prettier ]; diff --git a/modules/programs/nixvim/keymaps/_keymaps.nix b/modules/programs/nixvim/keymaps/_keymaps.nix index 160868f..12521cb 100644 --- a/modules/programs/nixvim/keymaps/_keymaps.nix +++ b/modules/programs/nixvim/keymaps/_keymaps.nix @@ -1,11 +1,9 @@ -{ ... }: -{ +{...}: { globals.mapleader = " "; keymaps = - [ ] + [] ++ (import ./_default.nix) ++ (import ./barbar.nix) ++ (import ./toggleterm.nix) ++ (import ./nvim-tree-toggle.nix); } - diff --git a/modules/programs/nixvim/keymaps/barbar.nix b/modules/programs/nixvim/keymaps/barbar.nix index d1cdf6a..1c33576 100644 --- a/modules/programs/nixvim/keymaps/barbar.nix +++ b/modules/programs/nixvim/keymaps/barbar.nix @@ -31,9 +31,9 @@ } ] ++ (builtins.genList (i: { - mode = "n"; - key = ""; - action = "BufferGoto ${toString (i + 1)}"; - options.silent = true; -}) 9) - + mode = "n"; + key = ""; + action = "BufferGoto ${toString (i + 1)}"; + options.silent = true; + }) + 9) diff --git a/modules/programs/nixvim/keymaps/toggleterm.nix b/modules/programs/nixvim/keymaps/toggleterm.nix index c1509ed..a5944b6 100644 --- a/modules/programs/nixvim/keymaps/toggleterm.nix +++ b/modules/programs/nixvim/keymaps/toggleterm.nix @@ -59,5 +59,6 @@ options.silent = true; options.noremap = true; } - ]) 9 + ]) + 9 ) diff --git a/modules/programs/nixvim/lua/_lua.nix b/modules/programs/nixvim/lua/_lua.nix index facb35d..ea8f50d 100644 --- a/modules/programs/nixvim/lua/_lua.nix +++ b/modules/programs/nixvim/lua/_lua.nix @@ -1,4 +1,2 @@ -{ ... }: -{ - +{...}: { } diff --git a/modules/programs/nixvim/plugins/_extraPlugins.nix b/modules/programs/nixvim/plugins/_extraPlugins.nix index 94a6838..3291315 100644 --- a/modules/programs/nixvim/plugins/_extraPlugins.nix +++ b/modules/programs/nixvim/plugins/_extraPlugins.nix @@ -1,15 +1,13 @@ -{ pkgs, ... }: -let - EXTRA_PLUGINS = [ - ./extras/neocord.nix - ./extras/mini-icons.nix - ]; +{pkgs, ...}: let + EXTRA_PLUGINS = [ + ./extras/neocord.nix + ./extras/mini-icons.nix + ]; - LUA = [ - ./lua/neocord.lua - ]; -in -{ - extraPlugins = map (path: import path { plugins = pkgs.vimPlugins; }) EXTRA_PLUGINS; - extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA); -} \ No newline at end of file + LUA = [ + ./lua/neocord.lua + ]; +in { + extraPlugins = map (path: import path {plugins = pkgs.vimPlugins;}) EXTRA_PLUGINS; + extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA); +} diff --git a/modules/programs/nixvim/plugins/_plugins.nix b/modules/programs/nixvim/plugins/_plugins.nix index 4d3f798..348c756 100644 --- a/modules/programs/nixvim/plugins/_plugins.nix +++ b/modules/programs/nixvim/plugins/_plugins.nix @@ -1,5 +1,4 @@ -{ ... }@inputs: -{ +{...} @ inputs: { plugins = { nvim-tree = import ./nvimtree.nix inputs; lsp = import ./lsp.nix inputs; diff --git a/modules/programs/nixvim/plugins/cmp.nix b/modules/programs/nixvim/plugins/cmp.nix index 8b49804..8d7163c 100644 --- a/modules/programs/nixvim/plugins/cmp.nix +++ b/modules/programs/nixvim/plugins/cmp.nix @@ -1,25 +1,25 @@ -{ ... }: { - enable = true; - autoEnableSources = true; +{...}: { + enable = true; + autoEnableSources = true; - settings = { - sources = [ - { name = "nvim_lsp"; } - { name = "path"; } - { name = "luasnip"; } - { name = "buffer"; } - ]; + settings = { + sources = [ + {name = "nvim_lsp";} + {name = "path";} + {name = "luasnip";} + {name = "buffer";} + ]; - mapping = { - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.scroll_docs(-4)"; - "" = "cmp.mapping.scroll_docs(4)"; - "" = "cmp.mapping.abort()"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; - "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; - }; - - formatting.fields = [ "kind" "abbr" "menu" ]; + mapping = { + "" = "cmp.mapping.complete()"; + "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.scroll_docs(4)"; + "" = "cmp.mapping.abort()"; + "" = "cmp.mapping.confirm({ select = true })"; + "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; + "" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})"; }; -} \ No newline at end of file + + formatting.fields = ["kind" "abbr" "menu"]; + }; +} diff --git a/modules/programs/nixvim/plugins/conform-nvim.nix b/modules/programs/nixvim/plugins/conform-nvim.nix index 192e491..f20b53e 100644 --- a/modules/programs/nixvim/plugins/conform-nvim.nix +++ b/modules/programs/nixvim/plugins/conform-nvim.nix @@ -1,15 +1,14 @@ -{ ... }: -{ +{...}: { enable = true; settings = { formatters_by_ft = { - javascript = [ "prettier" ]; - typescript = [ "prettier" ]; - json = [ "prettier" ]; - css = [ "prettier" ]; - html = [ "prettier" ]; - nix = [ "nixfmt" ]; - php = [ "php_cs_fixer" ]; + javascript = ["prettier"]; + typescript = ["prettier"]; + json = ["prettier"]; + css = ["prettier"]; + html = ["prettier"]; + nix = ["nixfmt"]; + php = ["php_cs_fixer"]; }; format_on_save = { diff --git a/modules/programs/nixvim/plugins/extras/mini-icons.nix b/modules/programs/nixvim/plugins/extras/mini-icons.nix index 38b4a25..13ea0ec 100644 --- a/modules/programs/nixvim/plugins/extras/mini-icons.nix +++ b/modules/programs/nixvim/plugins/extras/mini-icons.nix @@ -1,4 +1,3 @@ -{ plugins, ... }: -{ - plugin = plugins.mini-icons; -} \ No newline at end of file +{plugins, ...}: { + plugin = plugins.mini-icons; +} diff --git a/modules/programs/nixvim/plugins/extras/neocord.nix b/modules/programs/nixvim/plugins/extras/neocord.nix index 8af30c2..373d68e 100644 --- a/modules/programs/nixvim/plugins/extras/neocord.nix +++ b/modules/programs/nixvim/plugins/extras/neocord.nix @@ -1,4 +1,3 @@ -{ plugins, ... }: -{ - plugin = plugins.neocord; -} \ No newline at end of file +{plugins, ...}: { + plugin = plugins.neocord; +} diff --git a/modules/programs/nixvim/plugins/lint.nix b/modules/programs/nixvim/plugins/lint.nix index a46224a..1473ac2 100644 --- a/modules/programs/nixvim/plugins/lint.nix +++ b/modules/programs/nixvim/plugins/lint.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { enable = true; lintersByFt = { }; diff --git a/modules/programs/nixvim/plugins/lsp.nix b/modules/programs/nixvim/plugins/lsp.nix index ee013d0..c0694e9 100644 --- a/modules/programs/nixvim/plugins/lsp.nix +++ b/modules/programs/nixvim/plugins/lsp.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { enable = true; servers = { phpactor.enable = true; diff --git a/modules/programs/nixvim/plugins/lspkind.nix b/modules/programs/nixvim/plugins/lspkind.nix index 22cd50e..c140184 100644 --- a/modules/programs/nixvim/plugins/lspkind.nix +++ b/modules/programs/nixvim/plugins/lspkind.nix @@ -1,4 +1,4 @@ -{ ... }: { - enable = true; - cmp.enable = true; +{...}: { + enable = true; + cmp.enable = true; } diff --git a/modules/programs/nixvim/plugins/nvimtree.nix b/modules/programs/nixvim/plugins/nvimtree.nix index e9073ff..c41503c 100644 --- a/modules/programs/nixvim/plugins/nvimtree.nix +++ b/modules/programs/nixvim/plugins/nvimtree.nix @@ -1,5 +1,5 @@ -{ ... }: { - enable = true; - openOnSetupFile = true; - settings.auto_reload_on_write = true; +{...}: { + enable = true; + openOnSetupFile = true; + settings.auto_reload_on_write = true; } diff --git a/modules/programs/nixvim/plugins/which-key.nix b/modules/programs/nixvim/plugins/which-key.nix index f8a8422..ef3ca51 100644 --- a/modules/programs/nixvim/plugins/which-key.nix +++ b/modules/programs/nixvim/plugins/which-key.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { enable = true; settings = { preset = "modern"; diff --git a/modules/services/adguardhome.nix b/modules/services/adguardhome.nix index 9b2d2ae..b4fff2c 100644 --- a/modules/services/adguardhome.nix +++ b/modules/services/adguardhome.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.adguardhome = { enable = true; port = 34778; diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index 76d36d2..f5bac76 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.cloudflare-dyndns = { enable = true; apiTokenFile = "/home/asakiyuki/.secret/CLOUDFLARE_TOKEN_KEY"; @@ -8,6 +7,6 @@ ipv6 = false; ipv4 = true; deleteMissing = false; - domains = [ "ddns.asakiyuki.com" ]; + domains = ["ddns.asakiyuki.com"]; }; } diff --git a/modules/services/fail2ban.nix b/modules/services/fail2ban.nix index 3c63bab..3bea9fb 100644 --- a/modules/services/fail2ban.nix +++ b/modules/services/fail2ban.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.fail2ban = { enable = true; ignoreIP = [ diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index ea30230..4c61a20 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -1,10 +1,9 @@ -{ ... }: -{ +{...}: { services.openssh = { enable = true; - ports = [ 15523 ]; + ports = [15523]; authorizedKeysInHomedir = true; - authorizedKeysFiles = [ "/home/asakiyuki/.ssh/authorized_keys" ]; + authorizedKeysFiles = ["/home/asakiyuki/.ssh/authorized_keys"]; settings = { AllowUsers = [ "asakiyuki" diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix index 95f8f8f..56e3063 100644 --- a/modules/services/pipewire.nix +++ b/modules/services/pipewire.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { services.pipewire = { enable = true; pulse.enable = true; diff --git a/options/home/default.nix b/options/home/default.nix index 6e358ab..60a4ba6 100644 --- a/options/home/default.nix +++ b/options/home/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ - imports = [ ./programs.nix ]; - options = { }; +{...}: { + imports = [./programs.nix]; + options = {}; } diff --git a/options/home/programs.nix b/options/home/programs.nix index c6b5385..2bcb373 100644 --- a/options/home/programs.nix +++ b/options/home/programs.nix @@ -1,11 +1,9 @@ { - config, lib, pkgs, inputs, ... -}: -{ +}: { options.programs = { catppuccin = { enable = lib.mkEnableOption "catppuccin"; @@ -13,7 +11,7 @@ type = lib.types.package; default = pkgs.catppuccin-gtk.override { variant = "mocha"; - accents = [ "sapphire" ]; + accents = ["sapphire"]; size = "compact"; }; description = "Catppuccin GTK package"; @@ -21,19 +19,19 @@ kde = lib.mkOption { type = lib.types.package; default = pkgs.catppuccin-kde.override { - flavour = [ "mocha" ]; - accents = [ "sapphire" ]; + flavour = ["mocha"]; + accents = ["sapphire"]; }; description = "Catppuccin KDE package"; }; }; antigravity = { enable = lib.mkEnableOption "antigravity"; - package = lib.mkPackageOption pkgs "antigravity" { }; + package = lib.mkPackageOption pkgs "antigravity" {}; }; prismlauncher = { enable = lib.mkEnableOption "prismlauncher"; - package = lib.mkPackageOption pkgs "prismlauncher" { }; + package = lib.mkPackageOption pkgs "prismlauncher" {}; }; proton-ge = { enable = lib.mkEnableOption "proton-ge utils"; @@ -47,39 +45,39 @@ }; vlc = { enable = lib.mkEnableOption "vlc"; - package = lib.mkPackageOption pkgs "vlc" { }; + package = lib.mkPackageOption pkgs "vlc" {}; }; gimp = { enable = lib.mkEnableOption "gimp"; - package = lib.mkPackageOption pkgs "gimp" { }; + package = lib.mkPackageOption pkgs "gimp" {}; }; libreoffice = { enable = lib.mkEnableOption "libreoffice"; - package = lib.mkPackageOption pkgs "libreoffice-qt-fresh" { }; + package = lib.mkPackageOption pkgs "libreoffice-qt-fresh" {}; }; osu = { enable = lib.mkEnableOption "osu-lazer"; - package = lib.mkPackageOption pkgs "osu-lazer-bin" { }; + package = lib.mkPackageOption pkgs "osu-lazer-bin" {}; }; lmstudio = { enable = lib.mkEnableOption "lmstudio"; - package = lib.mkPackageOption pkgs "lmstudio" { }; + package = lib.mkPackageOption pkgs "lmstudio" {}; }; blender = { enable = lib.mkEnableOption "blender"; - package = lib.mkPackageOption pkgs "blender" { }; + package = lib.mkPackageOption pkgs "blender" {}; }; xprop = { enable = lib.mkEnableOption "xprop"; - package = lib.mkPackageOption pkgs "xprop" { }; + package = lib.mkPackageOption pkgs "xprop" {}; }; pavucontrol = { enable = lib.mkEnableOption "pavucontrol-qt"; - package = lib.mkPackageOption pkgs.lxqt "pavucontrol-qt" { }; + package = lib.mkPackageOption pkgs.lxqt "pavucontrol-qt" {}; }; nwg-look = { enable = lib.mkEnableOption "nwg-look"; - package = lib.mkPackageOption pkgs "nwg-look" { }; + package = lib.mkPackageOption pkgs "nwg-look" {}; }; proton-apps = { enable = lib.mkEnableOption "proton-pass and proton-authenticator"; @@ -100,7 +98,7 @@ }; cider = { enable = lib.mkEnableOption "cider-2"; - package = lib.mkPackageOption pkgs "cider-2" { }; + package = lib.mkPackageOption pkgs "cider-2" {}; }; }; } diff --git a/options/system/default.nix b/options/system/default.nix index 5a54b7a..b040e06 100644 --- a/options/system/default.nix +++ b/options/system/default.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { imports = [ ./programs.nix ./file.nix diff --git a/options/system/environment.nix b/options/system/environment.nix index 88a471b..ca2bb8a 100644 --- a/options/system/environment.nix +++ b/options/system/environment.nix @@ -1,5 +1,4 @@ -{ lib, ... }: -{ +{lib, ...}: { options.device = { dm = { sddm = { diff --git a/options/system/file.nix b/options/system/file.nix index 1f4e476..ad464d2 100644 --- a/options/system/file.nix +++ b/options/system/file.nix @@ -1,23 +1,22 @@ -{ lib, ... }: -{ +{lib, ...}: { options.device.files = { symlink = lib.mkOption { - default = { }; + default = {}; type = lib.types.attrsOf lib.types.str; }; source = lib.mkOption { - default = { }; + default = {}; type = lib.types.attrsOf lib.types.path; }; force = lib.mkOption { - default = { }; + default = {}; type = lib.types.attrsOf lib.types.bool; }; mkForce = lib.mkOption { - default = { }; + default = {}; type = lib.types.attrsOf lib.types.bool; }; }; diff --git a/options/system/hardware.nix b/options/system/hardware.nix index 002a483..887dafc 100644 --- a/options/system/hardware.nix +++ b/options/system/hardware.nix @@ -1,5 +1,5 @@ -{ lib, ... }: { - options.device = { - bluetooth.enable = lib.mkEnableOption "bluetooth"; - }; -} \ No newline at end of file +{lib, ...}: { + options.device = { + bluetooth.enable = lib.mkEnableOption "bluetooth"; + }; +} diff --git a/options/system/programs.nix b/options/system/programs.nix index c7a95db..fadd929 100644 --- a/options/system/programs.nix +++ b/options/system/programs.nix @@ -1,5 +1,8 @@ -{ lib, pkgs, ... }: { + lib, + pkgs, + ... +}: { options.device.programs = { terminal = { enable = lib.mkEnableOption "terminal"; @@ -23,35 +26,35 @@ options.programs = { ffmpeg = { enable = lib.mkEnableOption "ffmpeg"; - package = lib.mkPackageOption pkgs "ffmpeg-full" { }; + package = lib.mkPackageOption pkgs "ffmpeg-full" {}; }; nodejs = { enable = lib.mkEnableOption "nodejs"; - package = lib.mkPackageOption pkgs "nodejs" { }; + package = lib.mkPackageOption pkgs "nodejs" {}; }; bun = { enable = lib.mkEnableOption "bun"; - package = lib.mkPackageOption pkgs "bun" { }; + package = lib.mkPackageOption pkgs "bun" {}; }; brightnessctl = { enable = lib.mkEnableOption "brightnessctl"; - package = lib.mkPackageOption pkgs "brightnessctl" { }; + package = lib.mkPackageOption pkgs "brightnessctl" {}; }; php = { enable = lib.mkEnableOption "php"; - package = lib.mkPackageOption pkgs "php" { }; + package = lib.mkPackageOption pkgs "php" {}; }; ntfs3g = { enable = lib.mkEnableOption "ntfs3g"; - package = lib.mkPackageOption pkgs "ntfs3g" { }; + package = lib.mkPackageOption pkgs "ntfs3g" {}; }; python = { enable = lib.mkEnableOption "python"; - package = lib.mkPackageOption pkgs "python3" { }; + package = lib.mkPackageOption pkgs "python3" {}; }; jdk = { enable = lib.mkEnableOption "jdk-25"; - package = lib.mkPackageOption pkgs "jdk25" { }; + package = lib.mkPackageOption pkgs "jdk25" {}; }; winepackages = { enable = lib.mkEnableOption "Wine and Proton utilities"; @@ -67,11 +70,11 @@ }; quickshell = { enable = lib.mkEnableOption "quickshell"; - package = lib.mkPackageOption pkgs "quickshell" { }; + package = lib.mkPackageOption pkgs "quickshell" {}; }; papirus-icons = { enable = lib.mkEnableOption "papirus-icon-theme"; - package = lib.mkPackageOption pkgs "papirus-icon-theme" { }; + package = lib.mkPackageOption pkgs "papirus-icon-theme" {}; }; kde-packages = { enable = lib.mkEnableOption "KDE utility packages"; diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix index 837a83e..5960324 100644 --- a/overlays/nixpkgs.nix +++ b/overlays/nixpkgs.nix @@ -1,6 +1,6 @@ -{ inputs, ... }: { - nixpkgs.overlays = [ - inputs.niri.overlays.niri - inputs.dolphin-overlay.overlays.default - ]; -} \ No newline at end of file +{inputs, ...}: { + nixpkgs.overlays = [ + inputs.niri.overlays.niri + inputs.dolphin-overlay.overlays.default + ]; +} diff --git a/packages/bun.nix b/packages/bun.nix index ac08808..ccaae4a 100755 --- a/packages/bun.nix +++ b/packages/bun.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{pkgs, ...}: pkgs.stdenv.mkDerivation rec { pname = "bun"; version = "1.3.10"; diff --git a/packages/cage-xtmapper-0.1.5.nix b/packages/cage-xtmapper-0.1.5.nix index 9e6d3d1..1eb12cd 100644 --- a/packages/cage-xtmapper-0.1.5.nix +++ b/packages/cage-xtmapper-0.1.5.nix @@ -1,48 +1,46 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let RELEASE_VERSION = "20260208"; PACKAGE_VERSION = "0.1.5"; in -pkgs.stdenv.mkDerivation rec { - pname = "cage-xtmapper"; - version = PACKAGE_VERSION; + pkgs.stdenv.mkDerivation { + pname = "cage-xtmapper"; + version = PACKAGE_VERSION; - src = pkgs.fetchurl { - url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar"; - hash = "sha256-ZmdltOQInGbCBpf/e8D2sB9Rjt4wqd8wwuSFvryHfFA="; - }; + src = pkgs.fetchurl { + url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar"; + hash = "sha256-ZmdltOQInGbCBpf/e8D2sB9Rjt4wqd8wwuSFvryHfFA="; + }; - nativeBuildInputs = [ pkgs.autoPatchelfHook ]; + nativeBuildInputs = [pkgs.autoPatchelfHook]; - buildInputs = with pkgs; [ - wayland - libxkbcommon - pixman - libdrm - libGL - mesa - vulkan-loader - udev - seatd - libxcb-render-util - ]; + buildInputs = with pkgs; [ + wayland + libxkbcommon + pixman + libdrm + libGL + mesa + vulkan-loader + udev + seatd + libxcb-render-util + ]; - dontBuild = true; + dontBuild = true; - installPhase = '' - mkdir -p $out/bin - tar xvf $src - cp usr/local/bin/cage_xtmapper $out/bin/ - cp usr/local/bin/cage_xtmapper.sh $out/bin/ - chmod +x $out/bin/cage_xtmapper - chmod +x $out/bin/cage_xtmapper.sh - ''; - - meta = with pkgs.lib; { - description = "cage-xtmapper input mapping tool"; - homepage = "https://github.com/Xtr126/cage-xtmapper"; - license = licenses.mit; - platforms = platforms.linux; - }; -} + installPhase = '' + mkdir -p $out/bin + tar xvf $src + cp usr/local/bin/cage_xtmapper $out/bin/ + cp usr/local/bin/cage_xtmapper.sh $out/bin/ + chmod +x $out/bin/cage_xtmapper + chmod +x $out/bin/cage_xtmapper.sh + ''; + meta = with pkgs.lib; { + description = "cage-xtmapper input mapping tool"; + homepage = "https://github.com/Xtr126/cage-xtmapper"; + license = licenses.mit; + platforms = platforms.linux; + }; + } diff --git a/packages/cage-xtmapper-0.2.0.nix b/packages/cage-xtmapper-0.2.0.nix index dc8e95b..fae38c3 100644 --- a/packages/cage-xtmapper-0.2.0.nix +++ b/packages/cage-xtmapper-0.2.0.nix @@ -1,48 +1,46 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let RELEASE_VERSION = "20260208"; PACKAGE_VERSION = "0.2.0"; in -pkgs.stdenv.mkDerivation rec { - pname = "cage-xtmapper"; - version = PACKAGE_VERSION; + pkgs.stdenv.mkDerivation { + pname = "cage-xtmapper"; + version = PACKAGE_VERSION; - src = pkgs.fetchurl { - url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar"; - hash = "sha256-F1C3KnTzTO1vEouixqO1xnsGmufRyAk+BiRlypNq4kQ="; - }; + src = pkgs.fetchurl { + url = "https://github.com/Xtr126/cage-xtmapper/releases/download/v${RELEASE_VERSION}/cage-xtmapper-v${PACKAGE_VERSION}.tar"; + hash = "sha256-F1C3KnTzTO1vEouixqO1xnsGmufRyAk+BiRlypNq4kQ="; + }; - nativeBuildInputs = [ pkgs.autoPatchelfHook ]; + nativeBuildInputs = [pkgs.autoPatchelfHook]; - buildInputs = with pkgs; [ - wayland - libxkbcommon - pixman - libdrm - libGL - mesa - vulkan-loader - udev - seatd - libxcb-render-util - ]; + buildInputs = with pkgs; [ + wayland + libxkbcommon + pixman + libdrm + libGL + mesa + vulkan-loader + udev + seatd + libxcb-render-util + ]; - dontBuild = true; + dontBuild = true; - installPhase = '' - mkdir -p $out/bin - tar xvf $src - cp usr/local/bin/cage_xtmapper $out/bin/ - cp usr/local/bin/cage_xtmapper.sh $out/bin/ - chmod +x $out/bin/cage_xtmapper - chmod +x $out/bin/cage_xtmapper.sh - ''; - - meta = with pkgs.lib; { - description = "cage-xtmapper input mapping tool"; - homepage = "https://github.com/Xtr126/cage-xtmapper"; - license = licenses.mit; - platforms = platforms.linux; - }; -} + installPhase = '' + mkdir -p $out/bin + tar xvf $src + cp usr/local/bin/cage_xtmapper $out/bin/ + cp usr/local/bin/cage_xtmapper.sh $out/bin/ + chmod +x $out/bin/cage_xtmapper + chmod +x $out/bin/cage_xtmapper.sh + ''; + meta = with pkgs.lib; { + description = "cage-xtmapper input mapping tool"; + homepage = "https://github.com/Xtr126/cage-xtmapper"; + license = licenses.mit; + platforms = platforms.linux; + }; + } diff --git a/packages/catppuccin-obs.nix b/packages/catppuccin-obs.nix index 0dcd502..fd668d5 100644 --- a/packages/catppuccin-obs.nix +++ b/packages/catppuccin-obs.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{pkgs, ...}: pkgs.stdenv.mkDerivation { pname = "catppuccin-obs"; version = "main"; @@ -13,4 +13,3 @@ pkgs.stdenv.mkDerivation { cp -r $src/themes/* $out/ ''; } - diff --git a/packages/custom-cursors.nix b/packages/custom-cursors.nix index 2163719..b284b7c 100644 --- a/packages/custom-cursors.nix +++ b/packages/custom-cursors.nix @@ -1,31 +1,32 @@ { cursors ? "aemeath", size ? 48, -}: -let - _b = name: url: hash: { inherit name url hash; }; - _q = name: hash: { ${name} = _b name "https://static.asakiyuki.com/cursors/linux/${name}.tar.gz" hash; }; +}: let + _b = name: url: hash: {inherit name url hash;}; + _q = name: hash: {${name} = _b name "https://static.asakiyuki.com/cursors/linux/${name}.tar.gz" hash;}; - cursors-data = ( - _q "castorice" "sha256-nqAC+Itr+TXLGG8zYDBoBve+MeRckds5BM23DrsCTMM=" - // _q "aemeath" "sha256-0eEsUks5MwW4g5Xau24SgchX+LD9Ra3azAH0KL9JzQw=" - // _q "elysia" "sha256-mjDHklWrX5Pp/vejRQiMk0VA6afY04HXGyGD0PcopdI=" - // _q "cartethyia" "sha256-jYIDoX+rfUjw6LXrqE4y8j5IL0vByrrRkgRuz08Zy6U=" - ).${cursors}; + cursors-data = + ( + _q "castorice" "sha256-nqAC+Itr+TXLGG8zYDBoBve+MeRckds5BM23DrsCTMM=" + // _q "aemeath" "sha256-0eEsUks5MwW4g5Xau24SgchX+LD9Ra3azAH0KL9JzQw=" + // _q "elysia" "sha256-mjDHklWrX5Pp/vejRQiMk0VA6afY04HXGyGD0PcopdI=" + // _q "cartethyia" "sha256-jYIDoX+rfUjw6LXrqE4y8j5IL0vByrrRkgRuz08Zy6U=" + ).${ + cursors + }; in -{ pkgs, ... }: -{ - gtk.enable = true; - x11.enable = true; - name = cursors-data.name; - size = size; - package = pkgs.runCommand "moveUp" { } '' - mkdir -p $out/share/icons - ln -s ${ - pkgs.fetchzip { - url = cursors-data.url; - hash = cursors-data.hash; - } - } $out/share/icons/${cursors-data.name} - ''; -} + {pkgs, ...}: { + gtk.enable = true; + x11.enable = true; + name = cursors-data.name; + size = size; + package = pkgs.runCommand "moveUp" {} '' + mkdir -p $out/share/icons + ln -s ${ + pkgs.fetchzip { + url = cursors-data.url; + hash = cursors-data.hash; + } + } $out/share/icons/${cursors-data.name} + ''; + } diff --git a/packages/default.nix b/packages/default.nix index 5e6a3fa..fb7a1ff 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,7 +1,12 @@ -{ ... }@inputs: -{ - bun = import ./bun.nix; - cage-xtmapper = { version ? "0.2.0" }: import ./cage-xtmapper-${version}.nix; - catppuccin-obs = import ./catppuccin-obs.nix; - cursors = { name ? "aemeath", size ? 48 }: (import ./custom-cursors.nix { cursors = name; size = size; }); -} \ No newline at end of file +{...}: { + bun = import ./bun.nix; + cage-xtmapper = {version ? "0.2.0"}: import ./cage-xtmapper-${version}.nix; + catppuccin-obs = import ./catppuccin-obs.nix; + cursors = { + name ? "aemeath", + size ? 48, + }: (import ./custom-cursors.nix { + cursors = name; + size = size; + }); +}