From 75281a05eaee15968768193f331b407b0e286bd8 Mon Sep 17 00:00:00 2001 From: installer Date: Thu, 6 Feb 2025 18:25:39 +0100 Subject: [PATCH] chore: run fmt --- flake.nix | 104 ++++++------- hosts/home/configuration.nix | 66 +++++--- hosts/home/hardware-configuration.nix | 39 +++-- hosts/home/home.nix | 8 +- hosts/work/configuration.nix | 17 ++- hosts/work/disk-config.nix | 4 +- hosts/work/hardware-configuration.nix | 61 ++++---- hosts/work/home.nix | 8 +- modules/home-manager/dotfiles.nix | 3 +- modules/home-manager/helix.nix | 31 ++-- modules/home-manager/kitty.nix | 6 +- modules/home-manager/shell.nix | 3 +- modules/home-manager/waybar.nix | 210 +++++++++++++------------- modules/nixos/cli-environment.nix | 15 +- modules/nixos/desktop-apps.nix | 11 +- modules/nixos/dev-environment.nix | 11 +- modules/nixos/fonts.nix | 11 +- modules/nixos/gaming.nix | 13 +- modules/nixos/window-manager.nix | 13 +- scripts/rainbow-border.nix | 18 +-- 20 files changed, 380 insertions(+), 272 deletions(-) diff --git a/flake.nix b/flake.nix index 79d67c8..39b6ad2 100644 --- a/flake.nix +++ b/flake.nix @@ -14,59 +14,61 @@ }; }; - outputs = { - self, - nixpkgs, - disko, - ... - }@inputs: let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in - { - nixosConfigurations = { - arcueid = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit system; - inherit inputs; + outputs = + { + self, + nixpkgs, + disko, + ... + }@inputs: + let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in + { + nixosConfigurations = { + arcueid = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit system; + inherit inputs; + }; + modules = [ + ./modules/nixos/cli-environment.nix + ./modules/nixos/desktop-apps.nix + ./modules/nixos/dev-environment.nix + ./modules/nixos/fonts.nix + ./modules/nixos/gaming.nix + ./modules/nixos/window-manager.nix + ./hosts/home/configuration.nix + inputs.stylix.nixosModules.stylix + inputs.home-manager.nixosModules.default + ]; + }; + work-laptop = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system; }; + modules = [ + ./modules/nixos/cli-environment.nix + ./modules/nixos/dev-environment.nix + ./modules/nixos/fonts.nix + ./modules/nixos/window-manager.nix + disko.nixosModules.disko + inputs.stylix.nixosModules.stylix + inputs.home-manager.nixosModules.default + ./hosts/work/configuration.nix + ./hosts/work/hardware-configuration.nix + ]; }; - modules = [ - ./modules/nixos/cli-environment.nix - ./modules/nixos/desktop-apps.nix - ./modules/nixos/dev-environment.nix - ./modules/nixos/fonts.nix - ./modules/nixos/gaming.nix - ./modules/nixos/window-manager.nix - ./hosts/home/configuration.nix - inputs.stylix.nixosModules.stylix - inputs.home-manager.nixosModules.default - ]; }; - work-laptop = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs system;}; - modules = [ - ./modules/nixos/cli-environment.nix - ./modules/nixos/dev-environment.nix - ./modules/nixos/fonts.nix - ./modules/nixos/window-manager.nix - disko.nixosModules.disko - inputs.stylix.nixosModules.stylix - inputs.home-manager.nixosModules.default - ./hosts/work/configuration.nix - ./hosts/work/hardware-configuration.nix - ]; + homeConfigurations = { + "xmorel@work-laptop" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = pkgs; + extraSpecialArgs = { inherit inputs; }; + modules = [ + ./hosts/work/home.nix + ]; + }; }; + # homeManagerModules.default = ./modules/home-manager; + # nixosModules.default = ./modules/nixos; }; - homeConfigurations = { - "xmorel@work-laptop" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = pkgs; - extraSpecialArgs = {inherit inputs;}; - modules = [ - ./hosts/work/home.nix - ]; - }; - }; - # homeManagerModules.default = ./modules/home-manager; - # nixosModules.default = ./modules/nixos; - }; } diff --git a/hosts/home/configuration.nix b/hosts/home/configuration.nix index 6f2a597..8add296 100644 --- a/hosts/home/configuration.nix +++ b/hosts/home/configuration.nix @@ -1,11 +1,15 @@ -{ config, pkgs, inputs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { - imports = - [ - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - ]; + imports = [ + ./hardware-configuration.nix + inputs.home-manager.nixosModules.default + ]; # Bootloader. boot = { @@ -22,19 +26,31 @@ fileSystems."/mnt/apps" = { device = "/dev/disk/by-label/Apps"; fsType = "ntfs-3g"; - options = [ "rw" "uid=1000" ]; + options = [ + "rw" + "uid=1000" + ]; }; fileSystems."/mnt/photos" = { device = "/dev/disk/by-label/Photos"; fsType = "ntfs-3g"; - options = [ "rw" "uid=1000" ]; + options = [ + "rw" + "uid=1000" + ]; }; fileSystems."/mnt/ext" = { device = "/dev/disk/by-label/Externe"; fsType = "ntfs-3g"; - options = [ "auto" "nofail" "noatime" "rw" "uid=1000" ]; + options = [ + "auto" + "nofail" + "noatime" + "rw" + "uid=1000" + ]; }; networking.hostName = "arcueid"; # Define your hostname. @@ -42,13 +58,17 @@ nix = { settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; }; gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 10d"; }; + nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; }; time.timeZone = "Europe/Paris"; @@ -78,13 +98,17 @@ security = { rtkit.enable = true; - sudo.extraRules = [{ - users = [ "yoru" ]; - commands = [{ - command = "ALL"; - options = [ "NOPASSWD" ]; - }]; - }]; + sudo.extraRules = [ + { + users = [ "yoru" ]; + commands = [ + { + command = "ALL"; + options = [ "NOPASSWD" ]; + } + ]; + } + ]; }; services = { @@ -118,9 +142,11 @@ shell = pkgs.fish; isNormalUser = true; description = "Yoru"; - extraGroups = [ "networkmanager" "wheel" "scanner" "lp"]; - packages = with pkgs; [ - + extraGroups = [ + "networkmanager" + "wheel" + "scanner" + "lp" ]; }; home-manager = { diff --git a/hosts/home/hardware-configuration.nix b/hosts/home/hardware-configuration.nix index 081ae78..a70bdab 100644 --- a/hosts/home/hardware-configuration.nix +++ b/hosts/home/hardware-configuration.nix @@ -1,26 +1,41 @@ # 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") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ + "ehci_pci" + "ahci" + "xhci_pci" + "firewire_ohci" + "usb_storage" + "usbhid" + "sd_mod" + "sr_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/78a2cf35-4b53-4277-9742-f3077e7d5b32"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/78a2cf35-4b53-4277-9742-f3077e7d5b32"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/59dd4af7-bb20-4b88-82fe-97010227bd06"; } - ]; + swapDevices = [ + { device = "/dev/disk/by-uuid/59dd4af7-bb20-4b88-82fe-97010227bd06"; } + ]; # 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/home/home.nix b/hosts/home/home.nix index 5665c93..100d16a 100644 --- a/hosts/home/home.nix +++ b/hosts/home/home.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, outputs, ... }: +{ + config, + pkgs, + lib, + outputs, + ... +}: { home.username = "yoru"; diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix index 355159c..ad957ed 100644 --- a/hosts/work/configuration.nix +++ b/hosts/work/configuration.nix @@ -47,12 +47,15 @@ virtualisation.docker = { enable = true; }; - + security.rtkit.enable = true; nix = { settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; }; # gc = { # automatic = true; @@ -78,7 +81,11 @@ xmorel = { shell = pkgs.fish; isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + ]; initialPassword = "toto"; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBd3US4tUcbWZQgcVOtZIcbHF5mHwzJzygrQuE/pGde6" @@ -92,7 +99,7 @@ }; }; home-manager = { - extraSpecialArgs = {inherit inputs;}; + extraSpecialArgs = { inherit inputs; }; users = { "xmorel" = import ./home.nix; }; @@ -128,8 +135,6 @@ }; }; - - nixpkgs.config.allowUnfree = true; system.stateVersion = "24.05"; } diff --git a/hosts/work/disk-config.nix b/hosts/work/disk-config.nix index a70a7fb..2ebe2a4 100644 --- a/hosts/work/disk-config.nix +++ b/hosts/work/disk-config.nix @@ -1,4 +1,4 @@ -{ lib, ...}: +{ lib, ... }: { disko.devices = { disk.main = { @@ -20,7 +20,7 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = ["umask=0077"]; + mountOptions = [ "umask=0077" ]; }; }; root = { diff --git a/hosts/work/hardware-configuration.nix b/hosts/work/hardware-configuration.nix index 102fb0f..2d365b9 100644 --- a/hosts/work/hardware-configuration.nix +++ b/hosts/work/hardware-configuration.nix @@ -1,26 +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") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp5s0f3u1u3c2.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} +# 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") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0f0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp5s0f3u1u3c2.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/work/home.nix b/hosts/work/home.nix index 5ad7011..49f0273 100644 --- a/hosts/work/home.nix +++ b/hosts/work/home.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, outputs, ... }: +{ + config, + pkgs, + lib, + outputs, + ... +}: { home.username = "xmorel"; diff --git a/modules/home-manager/dotfiles.nix b/modules/home-manager/dotfiles.nix index b44f19f..a3eed46 100644 --- a/modules/home-manager/dotfiles.nix +++ b/modules/home-manager/dotfiles.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myHome.dotfiles.enable = lib.mkEnableOption "enables dotfiles"; }; diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index 71b4abc..c23e862 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -2,9 +2,11 @@ lib, config, ... -}: let +}: +let cfg = config.myHome.helix; -in { +in +{ options = { myHome.helix.enable = lib.mkEnableOption "enables helix"; }; @@ -24,22 +26,21 @@ in { # cursor-line = "warning" }; -# [[language]] -# name = "python" -# language-servers = ["pylsp"] + # [[language]] + # name = "python" + # language-servers = ["pylsp"] -# [language-server.pylsp.config.pylsp] -# plugins.pyls_mypy.enabled = true -# plugins.pyls_mypy.live_mode = true + # [language-server.pylsp.config.pylsp] + # plugins.pyls_mypy.enabled = true + # plugins.pyls_mypy.live_mode = true -# [[language]] -# name = "rust" -# language-servers = ["rust-analyzer"] + # [[language]] + # name = "rust" + # language-servers = ["rust-analyzer"] + + # [language-server.rust-analyzer.config] + # check.command = "clippy" -# [language-server.rust-analyzer.config] -# check.command = "clippy" - - }; }; }; diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix index 0e85b53..38708a7 100644 --- a/modules/home-manager/kitty.nix +++ b/modules/home-manager/kitty.nix @@ -2,9 +2,11 @@ lib, config, ... -}: let +}: +let cfg = config.myHome.kitty; -in { +in +{ options = { myHome.kitty.enable = lib.mkEnableOption "enables kitty"; }; diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 88ca99a..33c26a7 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myHome.shell.enable = lib.mkEnableOption "enables shell stuff"; }; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 8abaf78..2b93177 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -3,9 +3,11 @@ lib, config, ... -}: let +}: +let betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)"; -in { +in +{ options = { myHome.waybar.enable = lib.mkEnableOption "enables waybar"; }; @@ -24,7 +26,7 @@ in { ]; }; }; - + programs.waybar = { enable = true; package = pkgs.waybar; @@ -56,15 +58,15 @@ in { format = "{icon}"; format-icons = { "1" = "一"; - "2" = "二"; - "3" = "三"; - "4" = "四"; - "5" = "五"; - "6" = "六"; - "7" = "七"; - "8" = "八"; - "9" = "九"; - "10" = "十"; + "2" = "二"; + "3" = "三"; + "4" = "四"; + "5" = "五"; + "6" = "六"; + "7" = "七"; + "8" = "八"; + "9" = "九"; + "10" = "十"; }; on-scroll-up = "hyprctl dispatch workspace e+1"; on-scroll-down = "hyprctl dispatch workspace e-1"; @@ -195,98 +197,98 @@ in { tooltip = false; }; } - ]; - style = '' - * { - font-family: JetBrainsMono Nerd Font Mono; - font-size: 16px; - border-radius: 0px; - border: none; - min-height: 0px; - } - window#waybar { - background: rgba(0,0,0,0); - } - #workspaces { - color: #${config.stylix.base16Scheme.base00}; - background: #${config.stylix.base16Scheme.base01}; - margin: 4px 4px; - padding: 5px 5px; - border-radius: 16px; - } - #workspaces button { - font-weight: bold; - padding: 0px 5px; - margin: 0px 3px; - border-radius: 16px; - color: #${config.stylix.base16Scheme.base00}; - background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); - opacity: 0.5; - transition: ${betterTransition}; - } - #workspaces button.active { - font-weight: bold; - padding: 0px 5px; - margin: 0px 3px; - border-radius: 16px; - color: #${config.stylix.base16Scheme.base00}; - background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); - transition: ${betterTransition}; - opacity: 1.0; - min-width: 40px; - } - #workspaces button:hover { - font-weight: bold; - border-radius: 16px; - color: #${config.stylix.base16Scheme.base00}; - background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); - opacity: 0.8; - transition: ${betterTransition}; - } - tooltip { - background: #${config.stylix.base16Scheme.base00}; - border: 1px solid #${config.stylix.base16Scheme.base08}; - border-radius: 12px; - } - tooltip label { - color: #${config.stylix.base16Scheme.base08}; - } - #window, #pulseaudio, #cpu, #memory, #idle_inhibitor { - font-weight: bold; - margin: 4px 0px; - margin-left: 7px; - padding: 0px 18px; - background: #${config.stylix.base16Scheme.base04}; - color: #${config.stylix.base16Scheme.base00}; - border-radius: 24px 10px 24px 10px; - } - #custom-startmenu { - color: #${config.stylix.base16Scheme.base0B}; - background: #${config.stylix.base16Scheme.base02}; - font-size: 28px; - margin: 0px; - padding: 0px 30px 0px 15px; - border-radius: 0px 0px 40px 0px; - } - #custom-hyprbindings, #network, #battery, - #custom-notification, #tray, #custom-exit { - font-weight: bold; - background: #${config.stylix.base16Scheme.base0F}; - color: #${config.stylix.base16Scheme.base00}; - margin: 4px 0px; - margin-right: 7px; - border-radius: 10px 24px 10px 24px; - padding: 0px 18px; - } - #clock { - font-weight: bold; - color: #0D0E15; - background: linear-gradient(90deg, #${config.stylix.base16Scheme.base0E}, #${config.stylix.base16Scheme.base0C}); - margin: 0px; - padding: 0px 15px 0px 30px; - border-radius: 0px 0px 0px 40px; - } - ''; + ]; + style = '' + * { + font-family: JetBrainsMono Nerd Font Mono; + font-size: 16px; + border-radius: 0px; + border: none; + min-height: 0px; + } + window#waybar { + background: rgba(0,0,0,0); + } + #workspaces { + color: #${config.stylix.base16Scheme.base00}; + background: #${config.stylix.base16Scheme.base01}; + margin: 4px 4px; + padding: 5px 5px; + border-radius: 16px; + } + #workspaces button { + font-weight: bold; + padding: 0px 5px; + margin: 0px 3px; + border-radius: 16px; + color: #${config.stylix.base16Scheme.base00}; + background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); + opacity: 0.5; + transition: ${betterTransition}; + } + #workspaces button.active { + font-weight: bold; + padding: 0px 5px; + margin: 0px 3px; + border-radius: 16px; + color: #${config.stylix.base16Scheme.base00}; + background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); + transition: ${betterTransition}; + opacity: 1.0; + min-width: 40px; + } + #workspaces button:hover { + font-weight: bold; + border-radius: 16px; + color: #${config.stylix.base16Scheme.base00}; + background: linear-gradient(45deg, #${config.stylix.base16Scheme.base08}, #${config.stylix.base16Scheme.base0D}); + opacity: 0.8; + transition: ${betterTransition}; + } + tooltip { + background: #${config.stylix.base16Scheme.base00}; + border: 1px solid #${config.stylix.base16Scheme.base08}; + border-radius: 12px; + } + tooltip label { + color: #${config.stylix.base16Scheme.base08}; + } + #window, #pulseaudio, #cpu, #memory, #idle_inhibitor { + font-weight: bold; + margin: 4px 0px; + margin-left: 7px; + padding: 0px 18px; + background: #${config.stylix.base16Scheme.base04}; + color: #${config.stylix.base16Scheme.base00}; + border-radius: 24px 10px 24px 10px; + } + #custom-startmenu { + color: #${config.stylix.base16Scheme.base0B}; + background: #${config.stylix.base16Scheme.base02}; + font-size: 28px; + margin: 0px; + padding: 0px 30px 0px 15px; + border-radius: 0px 0px 40px 0px; + } + #custom-hyprbindings, #network, #battery, + #custom-notification, #tray, #custom-exit { + font-weight: bold; + background: #${config.stylix.base16Scheme.base0F}; + color: #${config.stylix.base16Scheme.base00}; + margin: 4px 0px; + margin-right: 7px; + border-radius: 10px 24px 10px 24px; + padding: 0px 18px; + } + #clock { + font-weight: bold; + color: #0D0E15; + background: linear-gradient(90deg, #${config.stylix.base16Scheme.base0E}, #${config.stylix.base16Scheme.base0C}); + margin: 0px; + padding: 0px 15px 0px 30px; + border-radius: 0px 0px 0px 40px; + } + ''; }; }; } diff --git a/modules/nixos/cli-environment.nix b/modules/nixos/cli-environment.nix index 32cfefb..22b8ca6 100644 --- a/modules/nixos/cli-environment.nix +++ b/modules/nixos/cli-environment.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.cli-environment; in { - imports = []; + imports = [ ]; options.services.cli-environment = { enable = mkEnableOption "enable cli-environment"; @@ -25,10 +30,12 @@ in bat tree imv - eza # ? + eza # ? appimage-run nh openssl + nixfmt-rfc-style + nil ]; programs.fish.enable = true; }; diff --git a/modules/nixos/desktop-apps.nix b/modules/nixos/desktop-apps.nix index f5c79f0..66ccae6 100644 --- a/modules/nixos/desktop-apps.nix +++ b/modules/nixos/desktop-apps.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.desktop-apps; in { - imports = []; + imports = [ ]; options.services.desktop-apps = { enable = mkEnableOption "enable desktop-apps"; diff --git a/modules/nixos/dev-environment.nix b/modules/nixos/dev-environment.nix index 83f887c..e665520 100644 --- a/modules/nixos/dev-environment.nix +++ b/modules/nixos/dev-environment.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.dev-environment; in { - imports = []; + imports = [ ]; options.services.dev-environment = { enable = mkEnableOption "enable dev-environment"; diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix index 50a4c84..f189b7b 100644 --- a/modules/nixos/fonts.nix +++ b/modules/nixos/fonts.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.fonts; in { - imports = []; + imports = [ ]; options.services.fonts = { enable = mkEnableOption "enable fonts"; diff --git a/modules/nixos/gaming.nix b/modules/nixos/gaming.nix index 293aa0c..b28e0ec 100644 --- a/modules/nixos/gaming.nix +++ b/modules/nixos/gaming.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.gaming; in { - imports = []; + imports = [ ]; options.services.gaming = { enable = mkEnableOption "enable gaming"; @@ -14,7 +19,7 @@ in environment.systemPackages = with pkgs; [ bottles steam - discord + discord openttd ]; programs.steam.enable = true; diff --git a/modules/nixos/window-manager.nix b/modules/nixos/window-manager.nix index c067a09..d9e3610 100644 --- a/modules/nixos/window-manager.nix +++ b/modules/nixos/window-manager.nix @@ -1,10 +1,15 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: with lib; -let +let cfg = config.services.window-manager; in { - imports = []; + imports = [ ]; options.services.window-manager = { enable = mkEnableOption "enable window-manager"; @@ -13,7 +18,7 @@ in config = mkIf cfg.enable { programs.hyprland.enable = true; programs.hyprlock.enable = true; - security.pam.services.hyprlock = {}; + security.pam.services.hyprlock = { }; environment.systemPackages = with pkgs; [ # wofi dolphin diff --git a/scripts/rainbow-border.nix b/scripts/rainbow-border.nix index d99d9ad..5214d3d 100644 --- a/scripts/rainbow-border.nix +++ b/scripts/rainbow-border.nix @@ -1,15 +1,15 @@ { pkgs }: pkgs.writeShellScriptBin "rainbow-border" '' -#!/bin/bash -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## -# for rainbow borders animation + #!/bin/bash + # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ ## + # for rainbow borders animation -function random_hex() { - random_hex=("0xff$(openssl rand -hex 3)") - echo $random_hex -} + function random_hex() { + random_hex=("0xff$(openssl rand -hex 3)") + echo $random_hex + } -# rainbow colors only for active window -hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg + # rainbow colors only for active window + hyprctl keyword general:col.active_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg ''