From ef89207879b0d38645a9c181a6d96cafd0c129f5 Mon Sep 17 00:00:00 2001 From: 0xTux <0xtux@pm.me> Date: Sun, 3 Mar 2024 02:11:14 +0530 Subject: [PATCH] formatted the code with alejandra --- flake.nix | 179 +++--- hosts/canopus/default.nix | 36 +- hosts/canopus/hardware-configuration.nix | 18 +- hosts/controller/default.nix | 16 +- hosts/controller/hardware-configuration.nix | 43 +- hosts/wsl/default.nix | 15 +- modules/home-manager/alacritty/default.nix | 2 +- modules/home-manager/barrier/default.nix | 2 +- modules/home-manager/bitwarden/default.nix | 3 +- modules/home-manager/default.nix | 10 +- modules/home-manager/firefox/default.nix | 7 +- modules/home-manager/git/default.nix | 2 +- modules/home-manager/hyprland/default.nix | 526 +++++++++-------- modules/home-manager/kdeconnect/default.nix | 2 +- modules/home-manager/nvim/default.nix | 7 +- modules/home-manager/picom/default.nix | 10 +- modules/home-manager/rofi/default.nix | 620 ++++++++++---------- modules/home-manager/shell/default.nix | 4 +- modules/home-manager/starship/default.nix | 2 +- modules/home-manager/tmux/default.nix | 6 +- modules/home-manager/vs-code/default.nix | 5 +- modules/home-manager/waybar/default.nix | 337 ++++++----- modules/home-manager/wezterm/default.nix | 2 +- modules/nixos/desktop/awesome/default.nix | 11 +- modules/nixos/desktop/hyprland/default.nix | 2 +- modules/nixos/headscale.nix | 12 +- modules/nixos/steam.nix | 2 +- modules/nixos/virtualisation/docker.nix | 4 +- modules/nixos/virtualisation/qemu.nix | 8 +- modules/nixos/virtualisation/waydroid.nix | 2 +- overlays/default.nix | 6 +- pkgs/astronvim/default.nix | 52 +- pkgs/default.nix | 6 +- pkgs/nvchad/default.nix | 52 +- 34 files changed, 1035 insertions(+), 976 deletions(-) diff --git a/flake.nix b/flake.nix index 2cef9da..247544d 100755 --- a/flake.nix +++ b/flake.nix @@ -16,100 +16,103 @@ nur.url = "github:nix-community/nur"; }; - outputs = { self, nixpkgs, home-manager, ... } @ inputs: - let - inherit (self) outputs; - forAllSystems = nixpkgs.lib.genAttrs [ - "x86_64-linux" - ]; - username = "tux"; - in - { - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + outputs = { + self, + nixpkgs, + home-manager, + ... + } @ inputs: let + inherit (self) outputs; + forAllSystems = nixpkgs.lib.genAttrs [ + "x86_64-linux" + ]; + username = "tux"; + in { + packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Custom packages and modifications, exported as overlays - overlays = import ./overlays { inherit inputs; }; + # Custom packages and modifications, exported as overlays + overlays = import ./overlays {inherit inputs;}; - # NixOS configuration entrypoint - # 'nixos-rebuild switch --flake .#your-hostname' - nixosConfigurations = { - canopus = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs username; }; - modules = [ - ./hosts/canopus + # NixOS configuration entrypoint + # 'nixos-rebuild switch --flake .#your-hostname' + nixosConfigurations = { + canopus = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs username;}; + modules = [ + ./hosts/canopus - ./modules/nixos/desktop/awesome - ./modules/nixos/desktop/hyprland - ./modules/nixos/virtualisation - ./modules/nixos/steam.nix + ./modules/nixos/desktop/awesome + ./modules/nixos/desktop/hyprland + ./modules/nixos/virtualisation + ./modules/nixos/steam.nix - home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs outputs username; }; - home-manager.users.${username} = { - imports = [ - ./modules/home-manager - ./modules/home-manager/hyprland - ./modules/home-manager/waybar - ./home/tux - ]; - }; - } - ]; - }; - - controller = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs username; }; - modules = [ - ./hosts/controller - ./modules/nixos/headscale.nix - - home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs outputs username; }; - home-manager.users.${username} = { - imports = [ - ./modules/home-manager - ./home/tux - ]; - }; - } - ]; - }; - - wsl = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs username; }; - modules = [ - ./hosts/wsl - - home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs outputs username; }; - home-manager.users.${username} = { - imports = [ - ./modules/home-manager - ./home/tux - ]; - }; - } - ]; - }; + home-manager.nixosModules.home-manager + { + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = {inherit inputs outputs username;}; + home-manager.users.${username} = { + imports = [ + ./modules/home-manager + ./modules/home-manager/hyprland + ./modules/home-manager/waybar + ./home/tux + ]; + }; + } + ]; }; - # Standalone home-manager configuration entrypoint - # home-manager switch --flake .#your-username@your-hostname' - homeConfigurations = { - "${username}@canopus" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs username; }; - modules = [ - ./modules/home-manager - ]; - }; + controller = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs username;}; + modules = [ + ./hosts/controller + ./modules/nixos/headscale.nix + + home-manager.nixosModules.home-manager + { + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = {inherit inputs outputs username;}; + home-manager.users.${username} = { + imports = [ + ./modules/home-manager + ./home/tux + ]; + }; + } + ]; + }; + + wsl = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs username;}; + modules = [ + ./hosts/wsl + + home-manager.nixosModules.home-manager + { + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = {inherit inputs outputs username;}; + home-manager.users.${username} = { + imports = [ + ./modules/home-manager + ./home/tux + ]; + }; + } + ]; }; }; + + # Standalone home-manager configuration entrypoint + # home-manager switch --flake .#your-username@your-hostname' + homeConfigurations = { + "${username}@canopus" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = {inherit inputs outputs username;}; + modules = [ + ./modules/home-manager + ]; + }; + }; + }; } diff --git a/hosts/canopus/default.nix b/hosts/canopus/default.nix index 2bf3871..1f1cd8f 100755 --- a/hosts/canopus/default.nix +++ b/hosts/canopus/default.nix @@ -1,4 +1,12 @@ -{ inputs, outputs, lib, config, pkgs, username, ... }: { +{ + inputs, + outputs, + lib, + config, + pkgs, + username, + ... +}: { imports = [ inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503 ./hardware-configuration.nix @@ -46,19 +54,25 @@ networkmanager.enable = true; firewall = { enable = true; - allowedTCPPorts = [ 80 443 3000 6666 ]; + allowedTCPPorts = [80 443 3000 6666 8081]; allowedTCPPortRanges = [ - { from = 1714; to = 1764; } + { + from = 1714; + to = 1764; + } ]; allowedUDPPortRanges = [ - { from = 1714; to = 1764; } + { + from = 1714; + to = 1764; + } ]; }; }; boot = { kernelPackages = pkgs.linuxPackages_zen; - supportedFilesystems = [ "ntfs" ]; + supportedFilesystems = ["ntfs"]; initrd.systemd.enable = true; loader = { @@ -89,9 +103,9 @@ user = { services.polkit-gnome-authentication-agent-1 = { description = "polkit-gnome-authentication-agent-1"; - wantedBy = [ "graphical-session.target" ]; - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; + wantedBy = ["graphical-session.target"]; + wants = ["graphical-session.target"]; + after = ["graphical-session.target"]; serviceConfig = { Type = "simple"; ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; @@ -108,7 +122,7 @@ zsh.enable = true; thunar = { enable = true; - plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; + plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman]; }; nix-ld.enable = true; nm-applet.enable = true; @@ -119,7 +133,7 @@ users.${username} = { initialPassword = "${username}"; isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "storage" ]; + extraGroups = ["networkmanager" "wheel" "storage"]; openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me'' ]; @@ -215,7 +229,7 @@ ollama.enable = true; }; - fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ]; + fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})]; system.stateVersion = "23.11"; } diff --git a/hosts/canopus/hardware-configuration.nix b/hosts/canopus/hardware-configuration.nix index f70b771..fe51089 100755 --- a/hosts/canopus/hardware-configuration.nix +++ b/hosts/canopus/hardware-configuration.nix @@ -1,15 +1,21 @@ # 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, ... }: { +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd"]; + boot.extraModulePackages = []; fileSystems."/" = { device = "/dev/disk/by-uuid/e79e5cdf-4197-4f44-96c7-3ab9ba9878bb"; @@ -21,7 +27,7 @@ fsType = "vfat"; }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/controller/default.nix b/hosts/controller/default.nix index 4bb1a41..45cbd76 100644 --- a/hosts/controller/default.nix +++ b/hosts/controller/default.nix @@ -1,6 +1,12 @@ -{ config, outputs, lib, pkgs, inputs, username, ... }: - { + config, + outputs, + lib, + pkgs, + inputs, + username, + ... +}: { imports = [ ./hardware-configuration.nix ]; @@ -64,17 +70,17 @@ users.${username} = { initialPassword = "${username}"; isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "storage" ]; + extraGroups = ["networkmanager" "wheel" "storage"]; openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me'' ]; }; }; - environment.systemPackages = with pkgs;[ + environment.systemPackages = with pkgs; [ ]; - fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ]; + fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})]; system.stateVersion = "23.11"; } diff --git a/hosts/controller/hardware-configuration.nix b/hosts/controller/hardware-configuration.nix index be94086..dd74a7b 100644 --- a/hosts/controller/hardware-configuration.nix +++ b/hosts/controller/hardware-configuration.nix @@ -1,32 +1,33 @@ # 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 + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/b5a9a9f6-be72-4520-b2ac-439d0479a34b"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/b5a9a9f6-be72-4520-b2ac-439d0479a34b"; + fsType = "ext4"; + }; - fileSystems."/efi" = - { - device = "systemd-1"; - fsType = "autofs"; - }; + fileSystems."/efi" = { + device = "systemd-1"; + fsType = "autofs"; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix index 6cad0b5..f6c5b10 100644 --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -1,6 +1,11 @@ -{ config, lib, pkgs, inputs, username, ... }: - { + config, + lib, + pkgs, + inputs, + username, + ... +}: { imports = [ inputs.nixos-wsl.nixosModules.wsl ]; @@ -32,16 +37,16 @@ users.${username} = { initialPassword = "${username}"; isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "storage" ]; + extraGroups = ["networkmanager" "wheel" "storage"]; openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D 0xtux@pm.me'' ]; }; }; - environment.systemPackages = with pkgs;[ ]; + environment.systemPackages = with pkgs; []; - fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) ]; + fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})]; system.stateVersion = "23.11"; } diff --git a/modules/home-manager/alacritty/default.nix b/modules/home-manager/alacritty/default.nix index dcb0f45..d3ab490 100755 --- a/modules/home-manager/alacritty/default.nix +++ b/modules/home-manager/alacritty/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { programs.alacritty = { enable = true; diff --git a/modules/home-manager/barrier/default.nix b/modules/home-manager/barrier/default.nix index 24c832d..0f3a8df 100755 --- a/modules/home-manager/barrier/default.nix +++ b/modules/home-manager/barrier/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{pkgs, ...}: { # services.barrier.client.enable = true; home.packages = with pkgs; [ diff --git a/modules/home-manager/bitwarden/default.nix b/modules/home-manager/bitwarden/default.nix index 74e2135..347f461 100644 --- a/modules/home-manager/bitwarden/default.nix +++ b/modules/home-manager/bitwarden/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: { - +{pkgs, ...}: { programs.rbw = { enable = true; settings = { diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index ba45b6d..6844aed 100755 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,4 +1,12 @@ -{ inputs, outputs, lib, config, pkgs, username, ... }: { +{ + inputs, + outputs, + lib, + config, + pkgs, + username, + ... +}: { imports = [ ./picom ./shell diff --git a/modules/home-manager/firefox/default.nix b/modules/home-manager/firefox/default.nix index 5705530..fd08a4b 100644 --- a/modules/home-manager/firefox/default.nix +++ b/modules/home-manager/firefox/default.nix @@ -1,4 +1,9 @@ -{ pkgs, inputs, username, ... }: { +{ + pkgs, + inputs, + username, + ... +}: { programs.firefox = { enable = true; diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix index a697a8b..1501187 100755 --- a/modules/home-manager/git/default.nix +++ b/modules/home-manager/git/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { programs.git = { enable = true; userName = "0xTux"; diff --git a/modules/home-manager/hyprland/default.nix b/modules/home-manager/hyprland/default.nix index 5116a8f..5880939 100644 --- a/modules/home-manager/hyprland/default.nix +++ b/modules/home-manager/hyprland/default.nix @@ -1,5 +1,8 @@ -{ lib, pkgs, ... }: { - +{ + lib, + pkgs, + ... +}: { programs = { waybar = { enable = true; @@ -9,276 +12,271 @@ wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - settings = - let - # Notify - notifycmd = "notify-send -h string:x-canonical-private-synchronous:hypr-cfg -u low"; + settings = let + # Notify + notifycmd = "notify-send -h string:x-canonical-private-synchronous:hypr-cfg -u low"; - # Elements - hypr_border_size = 2; - hypr_gaps_in = 5; - hypr_gaps_out = 10; - hypr_gaps_ws = -10; - hypr_rounding = 10; - groupbar_font_family = "Iosevka"; - groupbar_font_size = 10; + # Elements + hypr_border_size = 2; + hypr_gaps_in = 5; + hypr_gaps_out = 10; + hypr_gaps_ws = -10; + hypr_rounding = 10; + groupbar_font_family = "Iosevka"; + groupbar_font_size = 10; - # Colors - active_border_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; - inactive_border_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; - active_shadow_col = "0x66000000"; - inactive_shadow_col = "0x66000000"; - group_border_active_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; - group_border_inactive_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; - group_border_locked_active_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; - group_border_locked_inactive_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; - groupbar_text_color = "0xFFf1fcf9"; - in - { - #-- General - general = { - border_size = hypr_border_size; - gaps_in = hypr_gaps_in; - gaps_out = hypr_gaps_out; - gaps_workspaces = hypr_gaps_ws; - "col.active_border" = active_border_col; - "col.inactive_border" = inactive_border_col; - layout = "master"; - resize_on_border = true; - }; + # Colors + active_border_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; + inactive_border_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; + active_shadow_col = "0x66000000"; + inactive_shadow_col = "0x66000000"; + group_border_active_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; + group_border_inactive_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; + group_border_locked_active_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg"; + group_border_locked_inactive_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg"; + groupbar_text_color = "0xFFf1fcf9"; + in { + #-- General + general = { + border_size = hypr_border_size; + gaps_in = hypr_gaps_in; + gaps_out = hypr_gaps_out; + gaps_workspaces = hypr_gaps_ws; + "col.active_border" = active_border_col; + "col.inactive_border" = inactive_border_col; + layout = "master"; + resize_on_border = true; + }; - #-- Decoration - decoration = { - rounding = hypr_rounding; - active_opacity = 0.75; - inactive_opacity = 0.75; - fullscreen_opacity = 1.0; - drop_shadow = true; - shadow_range = 25; - shadow_render_power = 3; - "col.shadow" = active_shadow_col; - "col.shadow_inactive" = inactive_shadow_col; + #-- Decoration + decoration = { + rounding = hypr_rounding; + active_opacity = 0.75; + inactive_opacity = 0.75; + fullscreen_opacity = 1.0; + drop_shadow = true; + shadow_range = 25; + shadow_render_power = 3; + "col.shadow" = active_shadow_col; + "col.shadow_inactive" = inactive_shadow_col; - blur = { - enabled = true; - size = 5; - passes = 4; - ignore_opacity = true; - xray = true; - special = true; - }; - }; - - #-- Animations - animations = { + blur = { enabled = true; - first_launch_animation = true; - animation = [ - "windowsIn,1,5,default,popin 0%" - "windowsOut,1,5,default,popin" - "windowsMove,1,5,default,slide" - "fadeIn,1,8,default" - "fadeOut,1,8,default" - "fadeSwitch,1,8,default" - "fadeShadow,1,8,default" - "fadeDim,1,8,default" - "border,1,10,default" - "borderangle,1,10,default" - "workspaces,1,5,default,slide" - "specialWorkspace,1,5,default,fade" - ]; + size = 5; + passes = 4; + ignore_opacity = true; + xray = true; + special = true; }; + }; - #-- Input: Keyboard, Mouse, Touchpad - input = { - sensitivity = 0.5; - scroll_method = "2 fg"; - natural_scroll = true; - touchpad = { - natural_scroll = true; - clickfinger_behavior = false; - }; - }; - - #-- Group - group = { - "col.border_active" = group_border_active_col; - "col.border_inactive" = group_border_inactive_col; - "col.border_locked_active" = group_border_locked_active_col; - "col.border_locked_inactive" = group_border_locked_inactive_col; - groupbar = { - enabled = true; - font_family = groupbar_font_family; - font_size = groupbar_font_size; - text_color = groupbar_text_color; - "col.active" = group_border_active_col; - "col.inactive" = group_border_inactive_col; - "col.locked_active" = group_border_locked_active_col; - "col.locked_inactive" = group_border_locked_inactive_col; - }; - }; - - #-- Miscellaneous - misc = { - disable_hyprland_logo = true; - force_hypr_chan = false; - force_default_wallpaper = 0; - focus_on_activate = true; - no_direct_scanout = false; - background_color = "0x000000"; - }; - - #-- Output - monitor = ",preferred,auto,1"; - - #-- Layout : Dwindle - dwindle = { - pseudotile = false; - force_split = 0; - preserve_split = false; - smart_split = false; - smart_resizing = true; - permanent_direction_override = false; - special_scale_factor = 0.8; - split_width_multiplier = 1.0; - no_gaps_when_only = false; - use_active_for_splits = true; - default_split_ratio = 1.0; - }; - - #-- Layout : Master - master = { - allow_small_split = false; - special_scale_factor = 0.8; - mfact = 0.5; - new_is_master = false; - new_on_top = false; - no_gaps_when_only = false; - orientation = "left"; - inherit_fullscreen = true; - always_center_master = false; - smart_resizing = true; - drop_at_cursor = true; - }; - - #-- Window Rules - windowrule = [ ]; - - #-- Keybindings - bind = - let - terminal = "alacritty"; - browser = "firefox"; - filemanager = "thunar"; - editor = "geany"; - in - [ - - # groups - "SUPER, G, togglegroup" - "SUPER, G, exec, ${notifycmd} 'Toggled Group Mode'" - "SUPER, H, changegroupactive, b" - "SUPER, L, changegroupactive, f" - "SUPER_SHIFT, L, lockactivegroup, toggle" - "SUPER_SHIFT, L, exec, ${notifycmd} 'Toggled Group Lock'" - - # terminal - "SUPER, Return, exec, ${terminal}" - - # apps - "SUPER_SHIFT, F, exec, ${filemanager}" - "SUPER_SHIFT, E, exec, ${editor}" - "SUPER_SHIFT, B, exec, ${browser}" - - # hyprland - "SUPER, Q, killactive," - "SUPER, C, killactive," - "CTRL_ALT, Delete, exit," - "SUPER, F, fullscreen, 0" - "SUPER, F, exec, ${notifycmd} 'Fullscreen Mode'" - "SUPER, S, pseudo," - "SUPER, S, exec, ${notifycmd} 'Pseudo Mode'" - "SUPER, Space, togglefloating," - "SUPER, Space, centerwindow," - - # change focus - "SUPER, left, movefocus, l" - "SUPER, right, movefocus, r" - "SUPER, up, movefocus, u" - "SUPER, down, movefocus, d" - - # move active - "SUPER_SHIFT, left, movewindow, l" - "SUPER_SHIFT, right, movewindow, r" - "SUPER_SHIFT, up, movewindow, u" - "SUPER_SHIFT, down, movewindow, d" - - # switch between windows - "SUPER,Tab,cyclenext," - "SUPER,Tab,bringactivetotop," - - # workspaces - "SUPER, 1, workspace, 1" - "SUPER, 2, workspace, 2" - "SUPER, 3, workspace, 3" - "SUPER, 4, workspace, 4" - "SUPER, 5, workspace, 5" - "SUPER, 6, workspace, 6" - "SUPER, 7, workspace, 7" - "SUPER, 8, workspace, 8" - - # send to workspaces - "SUPER_SHIFT, 1, movetoworkspace, 1" - "SUPER_SHIFT, 2, movetoworkspace, 2" - "SUPER_SHIFT, 3, movetoworkspace, 3" - "SUPER_SHIFT, 4, movetoworkspace, 4" - "SUPER_SHIFT, 5, movetoworkspace, 5" - "SUPER_SHIFT, 6, movetoworkspace, 6" - "SUPER_SHIFT, 7, movetoworkspace, 7" - "SUPER_SHIFT, 8, movetoworkspace, 8" - - # seamless workspace switching - "CTRL_ALT, left, workspace, e-1" - "CTRL_ALT, right, workspace, e+1" - "CTRL_ALT_SHIFT, left, movetoworkspace, e-1" - "CTRL_ALT_SHIFT, right, movetoworkspace, e+1" - - # change workspace mode - "SUPER_CTRL, F, workspaceopt, allfloat" - "SUPER_CTRL, F, exec, ${notifycmd} 'Toggled All Float Mode'" - "SUPER_CTRL, S, workspaceopt, allpseudo" - "SUPER_CTRL, S, exec, ${notifycmd} 'Toggled All Pseudo Mode'" - - # misc - "SUPER_SHIFT, P, pin," - "SUPER_SHIFT, P, exec, ${notifycmd} 'Toggled Pin'" - "SUPER_SHIFT, S, swapnext" - "SUPER_SHIFT, O, toggleopaque" - ]; - - binde = [ - # resize active - "SUPER_CTRL, left, resizeactive, -20 0" - "SUPER_CTRL, right, resizeactive, 20 0" - "SUPER_CTRL, up, resizeactive, 0 -20" - "SUPER_CTRL, down, resizeactive, 0 20" - - # move active (Floating Only) - "SUPER_ALT, left, moveactive, -20 0" - "SUPER_ALT, right, moveactive, 20 0" - "SUPER_ALT, up, moveactive, 0 -20" - "SUPER_ALT, down, moveactive, 0 20" - ]; - bindm = [ - # mouse buttons - "SUPER, mouse:272, movewindow" - "SUPER, mouse:273, resizewindow" - ]; - - "exec-once" = [ - "${pkgs.swaybg}/bin/swaybg -i ~/Wallpapers/moments_before_desk.png" - "waybar" + #-- Animations + animations = { + enabled = true; + first_launch_animation = true; + animation = [ + "windowsIn,1,5,default,popin 0%" + "windowsOut,1,5,default,popin" + "windowsMove,1,5,default,slide" + "fadeIn,1,8,default" + "fadeOut,1,8,default" + "fadeSwitch,1,8,default" + "fadeShadow,1,8,default" + "fadeDim,1,8,default" + "border,1,10,default" + "borderangle,1,10,default" + "workspaces,1,5,default,slide" + "specialWorkspace,1,5,default,fade" ]; }; + + #-- Input: Keyboard, Mouse, Touchpad + input = { + sensitivity = 0.5; + scroll_method = "2 fg"; + natural_scroll = true; + touchpad = { + natural_scroll = true; + clickfinger_behavior = false; + }; + }; + + #-- Group + group = { + "col.border_active" = group_border_active_col; + "col.border_inactive" = group_border_inactive_col; + "col.border_locked_active" = group_border_locked_active_col; + "col.border_locked_inactive" = group_border_locked_inactive_col; + groupbar = { + enabled = true; + font_family = groupbar_font_family; + font_size = groupbar_font_size; + text_color = groupbar_text_color; + "col.active" = group_border_active_col; + "col.inactive" = group_border_inactive_col; + "col.locked_active" = group_border_locked_active_col; + "col.locked_inactive" = group_border_locked_inactive_col; + }; + }; + + #-- Miscellaneous + misc = { + disable_hyprland_logo = true; + force_hypr_chan = false; + force_default_wallpaper = 0; + focus_on_activate = true; + no_direct_scanout = false; + background_color = "0x000000"; + }; + + #-- Output + monitor = ",preferred,auto,1"; + + #-- Layout : Dwindle + dwindle = { + pseudotile = false; + force_split = 0; + preserve_split = false; + smart_split = false; + smart_resizing = true; + permanent_direction_override = false; + special_scale_factor = 0.8; + split_width_multiplier = 1.0; + no_gaps_when_only = false; + use_active_for_splits = true; + default_split_ratio = 1.0; + }; + + #-- Layout : Master + master = { + allow_small_split = false; + special_scale_factor = 0.8; + mfact = 0.5; + new_is_master = false; + new_on_top = false; + no_gaps_when_only = false; + orientation = "left"; + inherit_fullscreen = true; + always_center_master = false; + smart_resizing = true; + drop_at_cursor = true; + }; + + #-- Window Rules + windowrule = []; + + #-- Keybindings + bind = let + terminal = "alacritty"; + browser = "firefox"; + filemanager = "thunar"; + editor = "geany"; + in [ + # groups + "SUPER, G, togglegroup" + "SUPER, G, exec, ${notifycmd} 'Toggled Group Mode'" + "SUPER, H, changegroupactive, b" + "SUPER, L, changegroupactive, f" + "SUPER_SHIFT, L, lockactivegroup, toggle" + "SUPER_SHIFT, L, exec, ${notifycmd} 'Toggled Group Lock'" + + # terminal + "SUPER, Return, exec, ${terminal}" + + # apps + "SUPER_SHIFT, F, exec, ${filemanager}" + "SUPER_SHIFT, E, exec, ${editor}" + "SUPER_SHIFT, B, exec, ${browser}" + + # hyprland + "SUPER, Q, killactive," + "SUPER, C, killactive," + "CTRL_ALT, Delete, exit," + "SUPER, F, fullscreen, 0" + "SUPER, F, exec, ${notifycmd} 'Fullscreen Mode'" + "SUPER, S, pseudo," + "SUPER, S, exec, ${notifycmd} 'Pseudo Mode'" + "SUPER, Space, togglefloating," + "SUPER, Space, centerwindow," + + # change focus + "SUPER, left, movefocus, l" + "SUPER, right, movefocus, r" + "SUPER, up, movefocus, u" + "SUPER, down, movefocus, d" + + # move active + "SUPER_SHIFT, left, movewindow, l" + "SUPER_SHIFT, right, movewindow, r" + "SUPER_SHIFT, up, movewindow, u" + "SUPER_SHIFT, down, movewindow, d" + + # switch between windows + "SUPER,Tab,cyclenext," + "SUPER,Tab,bringactivetotop," + + # workspaces + "SUPER, 1, workspace, 1" + "SUPER, 2, workspace, 2" + "SUPER, 3, workspace, 3" + "SUPER, 4, workspace, 4" + "SUPER, 5, workspace, 5" + "SUPER, 6, workspace, 6" + "SUPER, 7, workspace, 7" + "SUPER, 8, workspace, 8" + + # send to workspaces + "SUPER_SHIFT, 1, movetoworkspace, 1" + "SUPER_SHIFT, 2, movetoworkspace, 2" + "SUPER_SHIFT, 3, movetoworkspace, 3" + "SUPER_SHIFT, 4, movetoworkspace, 4" + "SUPER_SHIFT, 5, movetoworkspace, 5" + "SUPER_SHIFT, 6, movetoworkspace, 6" + "SUPER_SHIFT, 7, movetoworkspace, 7" + "SUPER_SHIFT, 8, movetoworkspace, 8" + + # seamless workspace switching + "CTRL_ALT, left, workspace, e-1" + "CTRL_ALT, right, workspace, e+1" + "CTRL_ALT_SHIFT, left, movetoworkspace, e-1" + "CTRL_ALT_SHIFT, right, movetoworkspace, e+1" + + # change workspace mode + "SUPER_CTRL, F, workspaceopt, allfloat" + "SUPER_CTRL, F, exec, ${notifycmd} 'Toggled All Float Mode'" + "SUPER_CTRL, S, workspaceopt, allpseudo" + "SUPER_CTRL, S, exec, ${notifycmd} 'Toggled All Pseudo Mode'" + + # misc + "SUPER_SHIFT, P, pin," + "SUPER_SHIFT, P, exec, ${notifycmd} 'Toggled Pin'" + "SUPER_SHIFT, S, swapnext" + "SUPER_SHIFT, O, toggleopaque" + ]; + + binde = [ + # resize active + "SUPER_CTRL, left, resizeactive, -20 0" + "SUPER_CTRL, right, resizeactive, 20 0" + "SUPER_CTRL, up, resizeactive, 0 -20" + "SUPER_CTRL, down, resizeactive, 0 20" + + # move active (Floating Only) + "SUPER_ALT, left, moveactive, -20 0" + "SUPER_ALT, right, moveactive, 20 0" + "SUPER_ALT, up, moveactive, 0 -20" + "SUPER_ALT, down, moveactive, 0 20" + ]; + bindm = [ + # mouse buttons + "SUPER, mouse:272, movewindow" + "SUPER, mouse:273, resizewindow" + ]; + + "exec-once" = [ + "${pkgs.swaybg}/bin/swaybg -i ~/Wallpapers/moments_before_desk.png" + "waybar" + ]; + }; }; } diff --git a/modules/home-manager/kdeconnect/default.nix b/modules/home-manager/kdeconnect/default.nix index d7e3ec6..cff771e 100644 --- a/modules/home-manager/kdeconnect/default.nix +++ b/modules/home-manager/kdeconnect/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { services.kdeconnect = { enable = true; indicator = true; diff --git a/modules/home-manager/nvim/default.nix b/modules/home-manager/nvim/default.nix index 86801ab..3c456c8 100755 --- a/modules/home-manager/nvim/default.nix +++ b/modules/home-manager/nvim/default.nix @@ -1,5 +1,8 @@ -{ inputs, pkgs, ... }: { - +{ + inputs, + pkgs, + ... +}: { # fix nvchad # xdg.configFile."nvim" = { # source = "${pkgs.nvchad}"; diff --git a/modules/home-manager/picom/default.nix b/modules/home-manager/picom/default.nix index 91f89e2..093f7c5 100644 --- a/modules/home-manager/picom/default.nix +++ b/modules/home-manager/picom/default.nix @@ -1,4 +1,8 @@ -{ config, pkgs, ... }: { +{ + config, + pkgs, + ... +}: { services.picom = { enable = true; package = pkgs.picom-next; @@ -8,7 +12,7 @@ fade = true; fadeDelta = 10; - fadeSteps = [ 0.05 0.05 ]; + fadeSteps = [0.05 0.05]; fadeExclude = [ "window_type *= 'menu'" ]; @@ -36,7 +40,7 @@ corner-radius = 0; - # pijulius specifics + # pijulius specifics animations = true; animation-stiffness = 500; animation-window-mass = 1.0; diff --git a/modules/home-manager/rofi/default.nix b/modules/home-manager/rofi/default.nix index 7a636e8..8d72dfb 100644 --- a/modules/home-manager/rofi/default.nix +++ b/modules/home-manager/rofi/default.nix @@ -1,321 +1,317 @@ -{ config, ... }: { - programs.rofi = - { - enable = true; - extraConfig = - { - terminal = "alacritty"; +{config, ...}: { + programs.rofi = { + enable = true; + extraConfig = { + terminal = "alacritty"; - modes = "combi,keys"; + modes = "combi,keys"; - display-window = "window"; - display-drun = "run"; - display-windowcd = "windowcd"; - display-run = "run"; - display-ssh = "ssh"; - display-combi = "combi"; - display-keys = "keys"; - display-filebrowser = "filebrowser"; + display-window = "window"; + display-drun = "run"; + display-windowcd = "windowcd"; + display-run = "run"; + display-ssh = "ssh"; + display-combi = "combi"; + display-keys = "keys"; + display-filebrowser = "filebrowser"; - combi-modes = "window,drun"; - combi-hide-mode-prefix = false; - combi-display-format = "{mode} {text}"; + combi-modes = "window,drun"; + combi-hide-mode-prefix = false; + combi-display-format = "{mode} {text}"; - window-format = "[{w=-1}] {c=-1} {t=-1}"; - window-thumbnail = false; + window-format = "[{w=-1}] {c=-1} {t=-1}"; + window-thumbnail = false; - drun-url-launcher = "xdg-open"; - drun-match-fields = "name,generic,exec,categories,keywords"; - drun-display-format = "{name}[ ({generic})][ {exec}]"; - drun-show-actions = true; + drun-url-launcher = "xdg-open"; + drun-match-fields = "name,generic,exec,categories,keywords"; + drun-display-format = "{name}[ ({generic})][ {exec}]"; + drun-show-actions = true; - run-command = "{cmd}"; - run-list-command = ""; - run-shell-command = "{terminal} -e {cmd}"; + run-command = "{cmd}"; + run-list-command = ""; + run-shell-command = "{terminal} -e {cmd}"; - matching = "normal"; - font = "JetBrains Mono 11"; - show-icons = true; - scroll-method = 0; - cycle = false; - fixed-num-lines = false; - }; - theme = - let - inherit (config.lib.formats.rasi) mkLiteral; - in - { - "*" = { - font = "JetBrains Mono 11"; - - black = mkLiteral "#1d1f21"; - white = mkLiteral "#c5c8c6"; - red = mkLiteral "#cc6666"; - orange = mkLiteral "#de935f"; - yellow = mkLiteral "#f0c674"; - green = mkLiteral "#7cb36b"; - cyan = mkLiteral "#78bab9"; - blue = mkLiteral "#81a2be"; - magenta = mkLiteral "#b294bb"; - - black-bright = mkLiteral "#3c4044"; - white-bright = mkLiteral "#eaeaea"; - red-bright = mkLiteral "#d54e53"; - orange-bright = mkLiteral "#e78c45"; - yellow-bright = mkLiteral "#e7c547"; - green-bright = mkLiteral "#71c464"; - cyan-bright = mkLiteral "#6acdcc"; - blue-bright = mkLiteral "#7aa6da"; - magenta-bright = mkLiteral "#c397d8"; - - black-66 = mkLiteral "#131415"; - white-66 = mkLiteral "#828382"; - red-66 = mkLiteral "#864343"; - orange-66 = mkLiteral "#92613e"; - yellow-66 = mkLiteral "#9e824c"; - green-66 = mkLiteral "#517646"; - cyan-66 = mkLiteral "#4f7a7a"; - blue-66 = mkLiteral "#556a7d"; - magenta-66 = mkLiteral "#75617b"; - - black-33 = mkLiteral "#090a0a"; - white-33 = mkLiteral "#414141"; - red-33 = mkLiteral "#432121"; - orange-33 = mkLiteral "#49301f"; - yellow-33 = mkLiteral "#4f4126"; - green-33 = mkLiteral "#283b23"; - cyan-33 = mkLiteral "#273d3d"; - blue-33 = mkLiteral "#2a353e"; - magenta-33 = mkLiteral "#3a303d"; - - common-background = mkLiteral "@black"; - common-background-bright = mkLiteral "@black-bright"; - common-background-66 = " @black-66"; - common-foreground = mkLiteral "@white"; - common-foreground-bright = mkLiteral "@white-bright"; - common-foreground-66 = mkLiteral "@white-66"; - common-primary = mkLiteral "@yellow"; - common-primary-bright = mkLiteral "@yellow-bright"; - common-primary-66 = mkLiteral "@yellow-66"; - common-primary-33 = mkLiteral "@yellow-33"; - common-secondary = mkLiteral "@blue"; - common-secondary-bright = mkLiteral "@blue-bright"; - common-secondary-66 = mkLiteral "@blue-66"; - common-secondary-33 = mkLiteral "@blue-33"; - common-urgent = mkLiteral "@red"; - common-urgent-bright = mkLiteral "@red-bright"; - common-urgent-66 = mkLiteral "@red-66"; - common-urgent-33 = mkLiteral "@red-33"; - - background-color = mkLiteral "transparent"; - - normal-normal-background = mkLiteral "transparent"; - normal-normal-foreground = mkLiteral "@common-foreground"; - normal-normal-border-color = mkLiteral "transparent"; - normal-active-background = mkLiteral "transparent"; - normal-active-foreground = mkLiteral "@common-secondary-bright"; - normal-active-border-color = mkLiteral "transparent"; - normal-urgent-background = mkLiteral "transparent"; - normal-urgent-foreground = mkLiteral "@common-urgent-bright"; - normal-urgent-border-color = mkLiteral "transparent"; - - selected-normal-background = mkLiteral "@common-primary-33"; - selected-normal-foreground = mkLiteral "@common-primary-bright"; - selected-normal-border-color = mkLiteral "@common-primary-66"; - selected-active-background = mkLiteral "@common-secondary-33"; - selected-active-foreground = mkLiteral "@common-secondary-bright"; - selected-active-border-color = mkLiteral "@common-secondary-66"; - selected-urgent-background = mkLiteral "@common-urgent-33"; - selected-urgent-foreground = mkLiteral "@common-urgent-bright"; - selected-urgent-border-color = mkLiteral "@common-urgent-66"; - - alternate-normal-background = mkLiteral "@normal-normal-background"; - alternate-normal-foreground = mkLiteral "@normal-normal-foreground"; - alternate-normal-border-color = mkLiteral "@normal-normal-border-color"; - alternate-active-background = mkLiteral "@normal-active-background"; - alternate-active-foreground = mkLiteral "@normal-active-foreground"; - alternate-active-border-color = mkLiteral "@normal-active-border-color"; - alternate-urgent-background = mkLiteral "@normal-urgent-background"; - alternate-urgent-foreground = mkLiteral "@normal-urgent-foreground"; - alternate-urgent-border-color = mkLiteral "@normal-urgent-border-color"; - }; - - "window" = { - background-color = mkLiteral "#1d1f21e6"; #// @black + 0.85 alpha - border = 3; - border-color = mkLiteral "@black-bright"; - border-radius = 16; - width = 1024; - height = 460; - }; - - "mainbox" = { - padding = 16; - spacing = 16; - }; - - "inputbar" = { - background-color = mkLiteral "#333537"; #// @black-110 - border = 1; - border-color = mkLiteral "#606263"; #// @black-130 - border-radius = 8; - padding = mkLiteral "12 16"; - spacing = 0; - text-color = mkLiteral "@common-foreground"; - children = mkLiteral "[ entry, case-indicator, num-filtered-rows, textbox-num-sep, num-rows ]"; - }; - - "prompt" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "@common-foreground-bright"; - spacing = 0; - text-transform = mkLiteral "bold"; - }; - - "textbox-prompt-colon" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - margin = mkLiteral "0 0.3em 0 0"; - expand = false; - str = "="; - }; - - "entry" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "@common-foreground-bright"; - cursor = "text"; - placeholder-color = mkLiteral "@common-foreground-66"; - placeholder = "Type to filter"; - }; - - "case-indicator" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - }; - - "num-filtered-rows" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - expand = false; - }; - - "textbox-num-sep" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - expand = false; - str = "/"; - }; - - "num-rows" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - expand = false; - }; - - "message" = { - background-color = mkLiteral "@cyan-33"; - border = 1; - border-color = mkLiteral "@cyan-66"; - border-radius = 8; - padding = 16; - }; - - "textbox" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "@cyan-bright"; - }; - - "listview" = { - dynamic = true; - scrollbar = true; - spacing = 0; - }; - - "scrollbar" = { - background-color = mkLiteral "transparent"; - padding = 0; - margin = mkLiteral "0 0 0 4"; - handle-width = 8; - border = 0; - handle-color = mkLiteral "#626463"; #// @white-50 - }; - - "element" = { - border = 1; - border-radius = 8; - padding = mkLiteral "6 12"; - margin = mkLiteral "1 0"; - spacing = 12; - children = mkLiteral "[ element-icon, element-text ]"; - }; - - "element-icon" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - size = mkLiteral "1.0em"; - cursor = mkLiteral "inherit"; - }; - - "element-text" = { - background-color = mkLiteral "transparent"; - text-color = mkLiteral "inherit"; - highlight = mkLiteral "inherit"; - cursor = mkLiteral "inherit"; - }; - - "element normal.normal" = { - background-color = mkLiteral "@normal-normal-background"; - text-color = mkLiteral "@normal-normal-foreground"; - border-color = mkLiteral "@normal-normal-border-color"; - }; - - "element normal.urgent" = { - background-color = mkLiteral "@normal-urgent-background"; - text-color = mkLiteral "@normal-urgent-foreground"; - border-color = mkLiteral "@normal-urgent-border-color"; - }; - - "element normal.active" = { - background-color = mkLiteral "@normal-active-background"; - text-color = mkLiteral "@normal-active-foreground"; - border-color = mkLiteral "@normal-active-border-color"; - }; - - "element selected.normal" = { - background-color = mkLiteral "@selected-normal-background"; - text-color = mkLiteral "@selected-normal-foreground"; - border-color = mkLiteral "@selected-normal-border-color"; - }; - - "element selected.urgent" = { - background-color = mkLiteral "@selected-urgent-background"; - text-color = mkLiteral "@selected-urgent-foreground"; - border-color = mkLiteral "@selected-urgent-border-color"; - }; - - "element selected.active" = { - background-color = mkLiteral "@selected-active-background"; - text-color = mkLiteral "@selected-active-foreground"; - border-color = mkLiteral "@selected-active-border-color"; - }; - - "element alternate.normal" = { - background-color = mkLiteral "@alternate-normal-background"; - text-color = mkLiteral "@alternate-normal-foreground"; - border-color = mkLiteral "@alternate-normal-border-color"; - }; - - "element alternate.urgent" = { - background-color = mkLiteral "@alternate-urgent-background"; - text-color = mkLiteral "@alternate-urgent-foreground"; - border-color = mkLiteral "@alternate-urgent-border-color"; - }; - - "element alternate.active" = { - background-color = mkLiteral "@alternate-active-background"; - text-color = mkLiteral "@alternate-active-foreground"; - border-color = mkLiteral "@alternate-active-border-color"; - }; - }; + matching = "normal"; + font = "JetBrains Mono 11"; + show-icons = true; + scroll-method = 0; + cycle = false; + fixed-num-lines = false; }; + theme = let + inherit (config.lib.formats.rasi) mkLiteral; + in { + "*" = { + font = "JetBrains Mono 11"; + + black = mkLiteral "#1d1f21"; + white = mkLiteral "#c5c8c6"; + red = mkLiteral "#cc6666"; + orange = mkLiteral "#de935f"; + yellow = mkLiteral "#f0c674"; + green = mkLiteral "#7cb36b"; + cyan = mkLiteral "#78bab9"; + blue = mkLiteral "#81a2be"; + magenta = mkLiteral "#b294bb"; + + black-bright = mkLiteral "#3c4044"; + white-bright = mkLiteral "#eaeaea"; + red-bright = mkLiteral "#d54e53"; + orange-bright = mkLiteral "#e78c45"; + yellow-bright = mkLiteral "#e7c547"; + green-bright = mkLiteral "#71c464"; + cyan-bright = mkLiteral "#6acdcc"; + blue-bright = mkLiteral "#7aa6da"; + magenta-bright = mkLiteral "#c397d8"; + + black-66 = mkLiteral "#131415"; + white-66 = mkLiteral "#828382"; + red-66 = mkLiteral "#864343"; + orange-66 = mkLiteral "#92613e"; + yellow-66 = mkLiteral "#9e824c"; + green-66 = mkLiteral "#517646"; + cyan-66 = mkLiteral "#4f7a7a"; + blue-66 = mkLiteral "#556a7d"; + magenta-66 = mkLiteral "#75617b"; + + black-33 = mkLiteral "#090a0a"; + white-33 = mkLiteral "#414141"; + red-33 = mkLiteral "#432121"; + orange-33 = mkLiteral "#49301f"; + yellow-33 = mkLiteral "#4f4126"; + green-33 = mkLiteral "#283b23"; + cyan-33 = mkLiteral "#273d3d"; + blue-33 = mkLiteral "#2a353e"; + magenta-33 = mkLiteral "#3a303d"; + + common-background = mkLiteral "@black"; + common-background-bright = mkLiteral "@black-bright"; + common-background-66 = " @black-66"; + common-foreground = mkLiteral "@white"; + common-foreground-bright = mkLiteral "@white-bright"; + common-foreground-66 = mkLiteral "@white-66"; + common-primary = mkLiteral "@yellow"; + common-primary-bright = mkLiteral "@yellow-bright"; + common-primary-66 = mkLiteral "@yellow-66"; + common-primary-33 = mkLiteral "@yellow-33"; + common-secondary = mkLiteral "@blue"; + common-secondary-bright = mkLiteral "@blue-bright"; + common-secondary-66 = mkLiteral "@blue-66"; + common-secondary-33 = mkLiteral "@blue-33"; + common-urgent = mkLiteral "@red"; + common-urgent-bright = mkLiteral "@red-bright"; + common-urgent-66 = mkLiteral "@red-66"; + common-urgent-33 = mkLiteral "@red-33"; + + background-color = mkLiteral "transparent"; + + normal-normal-background = mkLiteral "transparent"; + normal-normal-foreground = mkLiteral "@common-foreground"; + normal-normal-border-color = mkLiteral "transparent"; + normal-active-background = mkLiteral "transparent"; + normal-active-foreground = mkLiteral "@common-secondary-bright"; + normal-active-border-color = mkLiteral "transparent"; + normal-urgent-background = mkLiteral "transparent"; + normal-urgent-foreground = mkLiteral "@common-urgent-bright"; + normal-urgent-border-color = mkLiteral "transparent"; + + selected-normal-background = mkLiteral "@common-primary-33"; + selected-normal-foreground = mkLiteral "@common-primary-bright"; + selected-normal-border-color = mkLiteral "@common-primary-66"; + selected-active-background = mkLiteral "@common-secondary-33"; + selected-active-foreground = mkLiteral "@common-secondary-bright"; + selected-active-border-color = mkLiteral "@common-secondary-66"; + selected-urgent-background = mkLiteral "@common-urgent-33"; + selected-urgent-foreground = mkLiteral "@common-urgent-bright"; + selected-urgent-border-color = mkLiteral "@common-urgent-66"; + + alternate-normal-background = mkLiteral "@normal-normal-background"; + alternate-normal-foreground = mkLiteral "@normal-normal-foreground"; + alternate-normal-border-color = mkLiteral "@normal-normal-border-color"; + alternate-active-background = mkLiteral "@normal-active-background"; + alternate-active-foreground = mkLiteral "@normal-active-foreground"; + alternate-active-border-color = mkLiteral "@normal-active-border-color"; + alternate-urgent-background = mkLiteral "@normal-urgent-background"; + alternate-urgent-foreground = mkLiteral "@normal-urgent-foreground"; + alternate-urgent-border-color = mkLiteral "@normal-urgent-border-color"; + }; + + "window" = { + background-color = mkLiteral "#1d1f21e6"; #// @black + 0.85 alpha + border = 3; + border-color = mkLiteral "@black-bright"; + border-radius = 16; + width = 1024; + height = 460; + }; + + "mainbox" = { + padding = 16; + spacing = 16; + }; + + "inputbar" = { + background-color = mkLiteral "#333537"; #// @black-110 + border = 1; + border-color = mkLiteral "#606263"; #// @black-130 + border-radius = 8; + padding = mkLiteral "12 16"; + spacing = 0; + text-color = mkLiteral "@common-foreground"; + children = mkLiteral "[ entry, case-indicator, num-filtered-rows, textbox-num-sep, num-rows ]"; + }; + + "prompt" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "@common-foreground-bright"; + spacing = 0; + text-transform = mkLiteral "bold"; + }; + + "textbox-prompt-colon" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + margin = mkLiteral "0 0.3em 0 0"; + expand = false; + str = "="; + }; + + "entry" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "@common-foreground-bright"; + cursor = "text"; + placeholder-color = mkLiteral "@common-foreground-66"; + placeholder = "Type to filter"; + }; + + "case-indicator" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + }; + + "num-filtered-rows" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + expand = false; + }; + + "textbox-num-sep" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + expand = false; + str = "/"; + }; + + "num-rows" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + expand = false; + }; + + "message" = { + background-color = mkLiteral "@cyan-33"; + border = 1; + border-color = mkLiteral "@cyan-66"; + border-radius = 8; + padding = 16; + }; + + "textbox" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "@cyan-bright"; + }; + + "listview" = { + dynamic = true; + scrollbar = true; + spacing = 0; + }; + + "scrollbar" = { + background-color = mkLiteral "transparent"; + padding = 0; + margin = mkLiteral "0 0 0 4"; + handle-width = 8; + border = 0; + handle-color = mkLiteral "#626463"; #// @white-50 + }; + + "element" = { + border = 1; + border-radius = 8; + padding = mkLiteral "6 12"; + margin = mkLiteral "1 0"; + spacing = 12; + children = mkLiteral "[ element-icon, element-text ]"; + }; + + "element-icon" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + size = mkLiteral "1.0em"; + cursor = mkLiteral "inherit"; + }; + + "element-text" = { + background-color = mkLiteral "transparent"; + text-color = mkLiteral "inherit"; + highlight = mkLiteral "inherit"; + cursor = mkLiteral "inherit"; + }; + + "element normal.normal" = { + background-color = mkLiteral "@normal-normal-background"; + text-color = mkLiteral "@normal-normal-foreground"; + border-color = mkLiteral "@normal-normal-border-color"; + }; + + "element normal.urgent" = { + background-color = mkLiteral "@normal-urgent-background"; + text-color = mkLiteral "@normal-urgent-foreground"; + border-color = mkLiteral "@normal-urgent-border-color"; + }; + + "element normal.active" = { + background-color = mkLiteral "@normal-active-background"; + text-color = mkLiteral "@normal-active-foreground"; + border-color = mkLiteral "@normal-active-border-color"; + }; + + "element selected.normal" = { + background-color = mkLiteral "@selected-normal-background"; + text-color = mkLiteral "@selected-normal-foreground"; + border-color = mkLiteral "@selected-normal-border-color"; + }; + + "element selected.urgent" = { + background-color = mkLiteral "@selected-urgent-background"; + text-color = mkLiteral "@selected-urgent-foreground"; + border-color = mkLiteral "@selected-urgent-border-color"; + }; + + "element selected.active" = { + background-color = mkLiteral "@selected-active-background"; + text-color = mkLiteral "@selected-active-foreground"; + border-color = mkLiteral "@selected-active-border-color"; + }; + + "element alternate.normal" = { + background-color = mkLiteral "@alternate-normal-background"; + text-color = mkLiteral "@alternate-normal-foreground"; + border-color = mkLiteral "@alternate-normal-border-color"; + }; + + "element alternate.urgent" = { + background-color = mkLiteral "@alternate-urgent-background"; + text-color = mkLiteral "@alternate-urgent-foreground"; + border-color = mkLiteral "@alternate-urgent-border-color"; + }; + + "element alternate.active" = { + background-color = mkLiteral "@alternate-active-background"; + text-color = mkLiteral "@alternate-active-foreground"; + border-color = mkLiteral "@alternate-active-border-color"; + }; + }; + }; } diff --git a/modules/home-manager/shell/default.nix b/modules/home-manager/shell/default.nix index d3fdac6..bb3c2be 100755 --- a/modules/home-manager/shell/default.nix +++ b/modules/home-manager/shell/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{pkgs, ...}: { programs = { bat.enable = true; zsh = { @@ -16,7 +16,7 @@ lazygit.enable = true; zoxide = { enable = true; - options = [ "--cmd cd" ]; + options = ["--cmd cd"]; }; ripgrep.enable = true; btop = { diff --git a/modules/home-manager/starship/default.nix b/modules/home-manager/starship/default.nix index c72de87..625723d 100755 --- a/modules/home-manager/starship/default.nix +++ b/modules/home-manager/starship/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { programs.starship = { enable = true; settings = { diff --git a/modules/home-manager/tmux/default.nix b/modules/home-manager/tmux/default.nix index 1360e83..7dc4e0d 100644 --- a/modules/home-manager/tmux/default.nix +++ b/modules/home-manager/tmux/default.nix @@ -1,8 +1,7 @@ -{ pkgs, ... }: { - +{pkgs, ...}: { programs.tmux = { enable = true; - plugins = with pkgs;[ + plugins = with pkgs; [ { plugin = tmuxPlugins.gruvbox; extraConfig = "set -g @tmux-gruvbox 'dark'"; @@ -42,5 +41,4 @@ "; }; - } diff --git a/modules/home-manager/vs-code/default.nix b/modules/home-manager/vs-code/default.nix index f3c8d20..7f39936 100644 --- a/modules/home-manager/vs-code/default.nix +++ b/modules/home-manager/vs-code/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: { - +{pkgs, ...}: { programs.vscode = { enable = true; package = pkgs.vscodium; @@ -39,7 +38,7 @@ "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode"; }; - extensions = with pkgs.vscode-extensions;[ + extensions = with pkgs.vscode-extensions; [ wakatime.vscode-wakatime ms-dotnettools.csharp naumovs.color-highlight diff --git a/modules/home-manager/waybar/default.nix b/modules/home-manager/waybar/default.nix index e234e9b..791b0a2 100644 --- a/modules/home-manager/waybar/default.nix +++ b/modules/home-manager/waybar/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: { - +{pkgs, ...}: { programs = { waybar = { enable = true; @@ -41,10 +40,10 @@ "active-only" = false; "on-click" = "activate"; "persistent-workspaces" = { - "1" = [ ]; - "2" = [ ]; - "3" = [ ]; - "4" = [ ]; + "1" = []; + "2" = []; + "3" = []; + "4" = []; }; }; @@ -69,7 +68,7 @@ "format-charging" = " {capacity}%"; "format-plugged" = " {capacity}%"; "format-alt" = "{time} {icon}"; - "format-icons" = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ]; + "format-icons" = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; }; "bluetooth" = { @@ -78,7 +77,7 @@ "format-connected" = " {num_connections}"; "format-connected-battery" = "{icon} {num_connections}"; # "format-connected-battery"= "{icon} {device_alias}-{device_battery_percentage}%"; - "format-icons" = [ "󰥇" "󰤾" "󰤿" "󰥀" "󰥁" "󰥂" "󰥃" "󰥄" "󰥅" "󰥆" "󰥈" ]; + "format-icons" = ["󰥇" "󰤾" "󰤿" "󰥀" "󰥁" "󰥂" "󰥃" "󰥄" "󰥅" "󰥆" "󰥈"]; # "format-device-preference"= [ "device1"; "device2" ]; // preference list deciding the displayed device If this config option is not defined or none of the devices in the list are connected; it will fall back to showing the last connected device. "tooltip-format" = "{controller_alias}\n{num_connections} connected"; "tooltip-format-connected" = "{controller_alias}\n{num_connections} connected\n\n{device_enumerate}"; @@ -107,7 +106,7 @@ "interval" = 10; "format" = "󰍛 {usage}%"; "format-alt" = "{icon0}{icon1}{icon2}{icon3}"; - "format-icons" = [ "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ]; + "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"]; }; "tray" = { @@ -156,188 +155,184 @@ "interval" = "once"; "tooltip" = false; }; - }; }; - style = - let - bar_bg = "rgba(23, 28, 34, 0.95)"; - main_bg = "#101419"; - main_fg = "#93cee9"; + style = let + bar_bg = "rgba(23, 28, 34, 0.95)"; + main_bg = "#101419"; + main_fg = "#93cee9"; - wb_act_bg = "#90ceaa"; - wb_act_fg = "#1f2328"; + wb_act_bg = "#90ceaa"; + wb_act_fg = "#1f2328"; - wb_hvr_bg = "#90ceaa"; - wb_hvr_fg = "#1f2328"; - in - '' - * { - border: none; - border-radius: 0px; - font-family: "JetBrainsMono Nerd Font"; - font-weight: bold; - font-size: 20px; - min-height: 10px; - } + wb_hvr_bg = "#90ceaa"; + wb_hvr_fg = "#1f2328"; + in '' + * { + border: none; + border-radius: 0px; + font-family: "JetBrainsMono Nerd Font"; + font-weight: bold; + font-size: 20px; + min-height: 10px; + } - window#waybar { - background: ${bar_bg}; - } + window#waybar { + background: ${bar_bg}; + } - tooltip { - background: ${main_bg}; - color: ${main_fg}; - border-radius: 7px; - border-width: 0px; - } + tooltip { + background: ${main_bg}; + color: ${main_fg}; + border-radius: 7px; + border-width: 0px; + } - #workspaces button { - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; - margin-left: 0px; - padding-left: 3px; - padding-right: 3px; - margin-right: 0px; - color: ${main_fg}; - animation: ws_normal 20s ease-in-out 1; - } + #workspaces button { + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + margin-top: 3px; + margin-bottom: 3px; + margin-left: 0px; + padding-left: 3px; + padding-right: 3px; + margin-right: 0px; + color: ${main_fg}; + animation: ws_normal 20s ease-in-out 1; + } - #workspaces button.active { - background: ${wb_act_bg}; - color: ${wb_act_fg}; - margin-left: 3px; - padding-left: 12px; - padding-right: 12px; - margin-right: 3px; - animation: ws_active 20s ease-in-out 1; - transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682); - } + #workspaces button.active { + background: ${wb_act_bg}; + color: ${wb_act_fg}; + margin-left: 3px; + padding-left: 12px; + padding-right: 12px; + margin-right: 3px; + animation: ws_active 20s ease-in-out 1; + transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682); + } - #workspaces button:hover { - background: ${wb_hvr_bg}; - color: ${wb_hvr_fg}; - animation: ws_hover 20s ease-in-out 1; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); - } + #workspaces button:hover { + background: ${wb_hvr_bg}; + color: ${wb_hvr_fg}; + animation: ws_hover 20s ease-in-out 1; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } - #taskbar button { - box-shadow: none; - text-shadow: none; - padding: 0px; - border-radius: 9px; - margin-top: 3px; - margin-bottom: 3px; - margin-left: 0px; - padding-left: 3px; - padding-right: 3px; - margin-right: 0px; - color: @wb-color; - animation: tb_normal 20s ease-in-out 1; - } + #taskbar button { + box-shadow: none; + text-shadow: none; + padding: 0px; + border-radius: 9px; + margin-top: 3px; + margin-bottom: 3px; + margin-left: 0px; + padding-left: 3px; + padding-right: 3px; + margin-right: 0px; + color: @wb-color; + animation: tb_normal 20s ease-in-out 1; + } - #taskbar button.active { - background: ${wb_act_bg}; - color: @wb-act-color; - margin-left: 3px; - padding-left: 12px; - padding-right: 12px; - margin-right: 3px; - animation: tb_active 20s ease-in-out 1; - transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682); - } + #taskbar button.active { + background: ${wb_act_bg}; + color: @wb-act-color; + margin-left: 3px; + padding-left: 12px; + padding-right: 12px; + margin-right: 3px; + animation: tb_active 20s ease-in-out 1; + transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682); + } - #taskbar button:hover { - background: ${wb_hvr_bg}; - color: @wb-hvr-color; - animation: tb_hover 20s ease-in-out 1; - transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); - } + #taskbar button:hover { + background: ${wb_hvr_bg}; + color: @wb-hvr-color; + animation: tb_hover 20s ease-in-out 1; + transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682); + } - #backlight, - #battery, - #bluetooth, - #custom-cliphist, - #clock, - #custom-cpuinfo, - #cpu, - #custom-gpuinfo, - #idle_inhibitor, - #language, - #memory, - #custom-mode, - #mpris, - #network, - #custom-power, - #pulseaudio, - #custom-spotify, - #taskbar, - #tray, - #custom-updates, - #custom-wallchange, - #custom-wbar, - #window, - #workspaces, - #custom-l_end, - #custom-r_end, - #custom-sl_end, - #custom-sr_end, - #custom-rl_end, - #custom-rr_end { - color: ${main_fg}; - background: ${main_bg}; - opacity: 1; - margin: 4px 0px 4px 0px; - padding-left: 4px; - padding-right: 4px; - } + #backlight, + #battery, + #bluetooth, + #custom-cliphist, + #clock, + #custom-cpuinfo, + #cpu, + #custom-gpuinfo, + #idle_inhibitor, + #language, + #memory, + #custom-mode, + #mpris, + #network, + #custom-power, + #pulseaudio, + #custom-spotify, + #taskbar, + #tray, + #custom-updates, + #custom-wallchange, + #custom-wbar, + #window, + #workspaces, + #custom-l_end, + #custom-r_end, + #custom-sl_end, + #custom-sr_end, + #custom-rl_end, + #custom-rr_end { + color: ${main_fg}; + background: ${main_bg}; + opacity: 1; + margin: 4px 0px 4px 0px; + padding-left: 4px; + padding-right: 4px; + } - #workspaces, - #taskbar { - padding: 0px; - } + #workspaces, + #taskbar { + padding: 0px; + } - #custom-r_end { - border-radius: 0px 21px 21px 0px; - margin-right: 9px; - padding-right: 3px; - } + #custom-r_end { + border-radius: 0px 21px 21px 0px; + margin-right: 9px; + padding-right: 3px; + } - #custom-l_end { - border-radius: 21px 0px 0px 21px; - margin-left: 9px; - padding-left: 3px; - } + #custom-l_end { + border-radius: 21px 0px 0px 21px; + margin-left: 9px; + padding-left: 3px; + } - #custom-sr_end { - border-radius: 0px; - margin-right: 9px; - padding-right: 3px; - } + #custom-sr_end { + border-radius: 0px; + margin-right: 9px; + padding-right: 3px; + } - #custom-sl_end { - border-radius: 0px; - margin-left: 9px; - padding-left: 3px; - } + #custom-sl_end { + border-radius: 0px; + margin-left: 9px; + padding-left: 3px; + } - #custom-rr_end { - border-radius: 0px 7px 7px 0px; - margin-right: 9px; - padding-right: 3px; - } + #custom-rr_end { + border-radius: 0px 7px 7px 0px; + margin-right: 9px; + padding-right: 3px; + } - #custom-rl_end { - border-radius: 7px 0px 0px 7px; - margin-left: 9px; - padding-left: 3px; - } - ''; + #custom-rl_end { + border-radius: 7px 0px 0px 7px; + margin-left: 9px; + padding-left: 3px; + } + ''; }; }; - } diff --git a/modules/home-manager/wezterm/default.nix b/modules/home-manager/wezterm/default.nix index 0241258..f8c0ad2 100644 --- a/modules/home-manager/wezterm/default.nix +++ b/modules/home-manager/wezterm/default.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { programs.wezterm = { enable = true; diff --git a/modules/nixos/desktop/awesome/default.nix b/modules/nixos/desktop/awesome/default.nix index d3bafad..b6df961 100755 --- a/modules/nixos/desktop/awesome/default.nix +++ b/modules/nixos/desktop/awesome/default.nix @@ -1,4 +1,11 @@ -{ inputs, outputs, lib, pkgs, username, ... }: { +{ + inputs, + outputs, + lib, + pkgs, + username, + ... +}: { services = { xserver = { enable = true; @@ -34,7 +41,7 @@ programs.dconf.enable = true; - environment.systemPackages = with pkgs;[ + environment.systemPackages = with pkgs; [ lua53Packages.lua wezterm acpi diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 68f0f54..5e80000 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -1,3 +1,3 @@ -{ ... }: { +{...}: { programs.hyprland.enable = true; } diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix index 6878aaa..7cfcff5 100644 --- a/modules/nixos/headscale.nix +++ b/modules/nixos/headscale.nix @@ -1,5 +1,9 @@ -{ config, lib, pkgs, ... }: { - +{ + config, + lib, + pkgs, + ... +}: { security = { acme = { defaults.email = "0xtux@pm.me"; @@ -56,6 +60,6 @@ }; }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - environment.systemPackages = with pkgs;[ headscale ]; + networking.firewall.allowedTCPPorts = [80 443]; + environment.systemPackages = with pkgs; [headscale]; } diff --git a/modules/nixos/steam.nix b/modules/nixos/steam.nix index 288c400..5bcd6ae 100644 --- a/modules/nixos/steam.nix +++ b/modules/nixos/steam.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { programs.steam = { enable = true; }; diff --git a/modules/nixos/virtualisation/docker.nix b/modules/nixos/virtualisation/docker.nix index 955d6bf..f9e794a 100755 --- a/modules/nixos/virtualisation/docker.nix +++ b/modules/nixos/virtualisation/docker.nix @@ -1,7 +1,7 @@ -{ username, ... }: { +{username, ...}: { virtualisation = { docker.enable = true; }; - users.users.${username}.extraGroups = [ "docker" ]; + users.users.${username}.extraGroups = ["docker"]; } diff --git a/modules/nixos/virtualisation/qemu.nix b/modules/nixos/virtualisation/qemu.nix index c7bfa88..e23fede 100755 --- a/modules/nixos/virtualisation/qemu.nix +++ b/modules/nixos/virtualisation/qemu.nix @@ -1,9 +1,13 @@ -{ pkgs, username, ... }: { +{ + pkgs, + username, + ... +}: { virtualisation = { libvirtd.enable = true; }; - users.users.${username}.extraGroups = [ "libvirtd" ]; + users.users.${username}.extraGroups = ["libvirtd"]; environment.systemPackages = with pkgs; [ virt-manager diff --git a/modules/nixos/virtualisation/waydroid.nix b/modules/nixos/virtualisation/waydroid.nix index c6459d2..1e2080a 100755 --- a/modules/nixos/virtualisation/waydroid.nix +++ b/modules/nixos/virtualisation/waydroid.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { virtualisation = { waydroid.enable = true; }; diff --git a/overlays/default.nix b/overlays/default.nix index 8260c02..d6aaade 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,5 @@ -{ inputs, ... }: { - additions = final: _prev: import ../pkgs { pkgs = final; }; +{inputs, ...}: { + additions = final: _prev: import ../pkgs {pkgs = final;}; modifications = final: prev: { #vscode = prev.vscode.overrideAttrs (oldAttrs: rec { @@ -11,7 +11,7 @@ # buildInputs = oldAttrs.buildInputs; #}); - awesome = inputs.nixpkgs-f2k.packages.${prev.system}.awesome-git.override { lua = prev.lua53Packages.lua; }; + awesome = inputs.nixpkgs-f2k.packages.${prev.system}.awesome-git.override {lua = prev.lua53Packages.lua;}; }; # When applied, the unstable nixpkgs set (declared in the flake inputs) will diff --git a/pkgs/astronvim/default.nix b/pkgs/astronvim/default.nix index 51a6a15..db03bd1 100644 --- a/pkgs/astronvim/default.nix +++ b/pkgs/astronvim/default.nix @@ -1,30 +1,32 @@ -{ lib, stdenv, pkgs }: - -let +{ + lib, + stdenv, + pkgs, +}: let user = ./user; in -stdenv.mkDerivation { - pname = "astronvim"; - version = "3.44.1"; + stdenv.mkDerivation { + pname = "astronvim"; + version = "3.44.1"; - src = pkgs.fetchFromGitHub { - owner = "AstroNvim"; - repo = "AstroNvim"; - rev = "refs/heads/main"; - sha256 = "sha256-1nfMx9XaTOfuz1IlvepJdEfrX539RRVN5RXzUR00tfk="; - }; + src = pkgs.fetchFromGitHub { + owner = "AstroNvim"; + repo = "AstroNvim"; + rev = "refs/heads/main"; + sha256 = "sha256-1nfMx9XaTOfuz1IlvepJdEfrX539RRVN5RXzUR00tfk="; + }; - installPhase = '' - mkdir $out - cp -r * "$out/" - mkdir -p "$out/lua/user" - cp -r ${user}/* "$out/lua/user/" - ''; + installPhase = '' + mkdir $out + cp -r * "$out/" + mkdir -p "$out/lua/user" + cp -r ${user}/* "$out/lua/user/" + ''; - meta = with lib; { - description = "AstroNvim"; - homepage = "https://github.com/AstroNvim/AstroNvim"; - platforms = platforms.all; - license = licenses.gpl3; - }; -} + meta = with lib; { + description = "AstroNvim"; + homepage = "https://github.com/AstroNvim/AstroNvim"; + platforms = platforms.all; + license = licenses.gpl3; + }; + } diff --git a/pkgs/default.nix b/pkgs/default.nix index cc78f32..337d370 100755 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { - nvchad = pkgs.callPackage ./nvchad { }; - astronvim = pkgs.callPackage ./astronvim { }; +{pkgs, ...}: { + nvchad = pkgs.callPackage ./nvchad {}; + astronvim = pkgs.callPackage ./astronvim {}; } diff --git a/pkgs/nvchad/default.nix b/pkgs/nvchad/default.nix index a79e168..5bdc442 100644 --- a/pkgs/nvchad/default.nix +++ b/pkgs/nvchad/default.nix @@ -1,30 +1,32 @@ -{ stdenv, lib, fetchFromGitHub }: - -let +{ + stdenv, + lib, + fetchFromGitHub, +}: let custom = ./custom; in -stdenv.mkDerivation { - pname = "nvchad"; - version = "2.0.0"; + stdenv.mkDerivation { + pname = "nvchad"; + version = "2.0.0"; - src = fetchFromGitHub { - owner = "NvChad"; - repo = "NvChad"; - rev = "refs/heads/v2.0"; - sha256 = "sha256-tKMvKdB3jPSvcyewaOe8oak3pXhjAcLyyxgGMiMeqeU="; - }; + src = fetchFromGitHub { + owner = "NvChad"; + repo = "NvChad"; + rev = "refs/heads/v2.0"; + sha256 = "sha256-tKMvKdB3jPSvcyewaOe8oak3pXhjAcLyyxgGMiMeqeU="; + }; - installPhase = '' - mkdir $out - cp -r * "$out/" - mkdir -p "$out/lua/custom" - cp -r ${custom}/* "$out/lua/custom/" - ''; + installPhase = '' + mkdir $out + cp -r * "$out/" + mkdir -p "$out/lua/custom" + cp -r ${custom}/* "$out/lua/custom/" + ''; - meta = with lib; { - description = "NvChad"; - homepage = "https://github.com/NvChad/NvChad"; - platforms = platforms.all; - license = licenses.gpl3; - }; -} + meta = with lib; { + description = "NvChad"; + homepage = "https://github.com/NvChad/NvChad"; + platforms = platforms.all; + license = licenses.gpl3; + }; + }