diff --git a/flake.nix b/flake.nix index 2174cc9..3a97ae5 100644 --- a/flake.nix +++ b/flake.nix @@ -18,34 +18,41 @@ nvf.url = "github:notashelf/nvf"; }; - outputs = { self, nixpkgs, nix-flatpak, nvf, ... } @ inputs: + outputs = + { + self, + nixpkgs, + nix-flatpak, + nvf, + ... + }@inputs: let system = "x86_64-linux"; overlays = builtins.attrValues (import ./overlays); in - { - nixosConfigurations = { - desktop1 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system overlays; }; - modules = [ - ./hosts/desktop1/configuration.nix - nix-flatpak.nixosModules.nix-flatpak - inputs.stylix.nixosModules.stylix - nvf.nixosModules.default - ]; - }; - laptop1 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system overlays; }; - modules = [ - ./hosts/laptop1/configuration.nix - nix-flatpak.nixosModules.nix-flatpak - inputs.stylix.nixosModules.stylix - nvf.nixosModules.default - ]; - }; + { + nixosConfigurations = { + desktop1 = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system overlays; }; + modules = [ + ./hosts/desktop1/configuration.nix + nix-flatpak.nixosModules.nix-flatpak + inputs.stylix.nixosModules.stylix + nvf.nixosModules.default + ]; + }; + laptop1 = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs system overlays; }; + modules = [ + ./hosts/laptop1/configuration.nix + nix-flatpak.nixosModules.nix-flatpak + inputs.stylix.nixosModules.stylix + nvf.nixosModules.default + ]; + }; + }; }; - }; } diff --git a/hosts/common/common.nix b/hosts/common/common.nix index ebd11c2..0612930 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -1,18 +1,25 @@ -{ inputs, pkgs, overlays, ... }: +{ + inputs, + pkgs, + overlays, + ... +}: { - imports = - [ - inputs.home-manager.nixosModules.home-manager - ../../modules/nix/default.nix - ]; + imports = [ + inputs.home-manager.nixosModules.home-manager + ../../modules/nix/default.nix + ]; nixpkgs.overlays = overlays; users.users.smayzy = { isNormalUser = true; description = "smayzy"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + ]; }; environment.systemPackages = with pkgs; [ diff --git a/hosts/common/home.nix b/hosts/common/home.nix index 333d16e..b2f2beb 100644 --- a/hosts/common/home.nix +++ b/hosts/common/home.nix @@ -1,9 +1,8 @@ { pkgs, ... }: { - imports = - [ - ../../modules/home-manager/default.nix + imports = [ + ../../modules/home-manager/default.nix ]; smayzy.webapps.enable = true; @@ -26,7 +25,7 @@ recursive = true; force = true; }; - "wallpaper" = { + "wallpaper" = { source = builtins.toPath ../../wallpapers; recursive = true; force = true; @@ -41,8 +40,8 @@ dconf.settings = { "org/virt-manager/virt-manager/connections" = { - autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; }; }; @@ -53,9 +52,9 @@ syntaxHighlighting.enable = true; history.size = 100000; shellAliases = { - grep = "grep --color=auto"; - cp = "cp -r"; - cd = "sl"; + grep = "grep --color=auto"; + cp = "cp -r"; + cd = "sl"; }; }; diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index 07f016b..9dc158c 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -1,11 +1,10 @@ { inputs, config, ... }: { - imports = - [ - ../common/common.nix - ./hardware-configuration.nix - ]; + imports = [ + ../common/common.nix + ./hardware-configuration.nix + ]; networking.hostName = "desktop1"; diff --git a/hosts/desktop1/hardware-configuration.nix b/hosts/desktop1/hardware-configuration.nix index 4a1a305..15c0b31 100644 --- a/hosts/desktop1/hardware-configuration.nix +++ b/hosts/desktop1/hardware-configuration.nix @@ -1,25 +1,41 @@ -{ 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 = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "usbhid" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/976bcf9c-3b56-4aa6-98f8-1c899af2b0f8"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/8E7F-2417"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/8E7F-2417"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; swapDevices = [ ]; diff --git a/hosts/desktop1/home.nix b/hosts/desktop1/home.nix index baeb1e2..e328f19 100644 --- a/hosts/desktop1/home.nix +++ b/hosts/desktop1/home.nix @@ -1,8 +1,7 @@ { ... }: { - imports = - [ - ../common/home.nix + imports = [ + ../common/home.nix ]; } diff --git a/hosts/laptop1/configuration.nix b/hosts/laptop1/configuration.nix index c31849e..711b252 100644 --- a/hosts/laptop1/configuration.nix +++ b/hosts/laptop1/configuration.nix @@ -1,12 +1,11 @@ { inputs, config, ... }: { - imports = - [ - ../common/common.nix - ./hardware-configuration.nix - ]; - + imports = [ + ../common/common.nix + ./hardware-configuration.nix + ]; + smayzy = { laptop.enable = true; hyprland.enable = true; diff --git a/hosts/laptop1/hardware-configuration.nix b/hosts/laptop1/hardware-configuration.nix index b0a90f7..f886221 100644 --- a/hosts/laptop1/hardware-configuration.nix +++ b/hosts/laptop1/hardware-configuration.nix @@ -1,32 +1,46 @@ # 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 = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/fa4f1a61-338b-4f1e-9f6c-2b2f2cd12f38"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/8E15-A6E3"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/8E15-A6E3"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/b451db56-e0a5-4799-88a1-34a31ffe3b08"; } + ]; # 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/laptop1/home.nix b/hosts/laptop1/home.nix index baeb1e2..e328f19 100644 --- a/hosts/laptop1/home.nix +++ b/hosts/laptop1/home.nix @@ -1,8 +1,7 @@ { ... }: { - imports = - [ - ../common/home.nix + imports = [ + ../common/home.nix ]; } diff --git a/modules/home-manager/lf/lf.nix b/modules/home-manager/lf/lf.nix index 723ec3a..993be6b 100644 --- a/modules/home-manager/lf/lf.nix +++ b/modules/home-manager/lf/lf.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -8,27 +13,26 @@ in default = false; description = "set to true if you want to use a nvidia GC"; }; - config = mkIf config.smayzy.lf.enable { xdg.configFile."lf/icons".source = ./icons; - + programs.lf = { enable = true; commands = { dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"''; editor-open = ''$$EDITOR $f''; mkdir = '' - ''${{ - printf "Directory Name: " - read DIR - mkdir $DIR - }} + ''${{ + printf "Directory Name: " + read DIR + mkdir $DIR + }} ''; }; - + keybindings = { - + "\\\"" = ""; o = ""; c = "mkdir"; @@ -36,18 +40,18 @@ in "`" = "mark-load"; "\\'" = "mark-load"; "" = "open"; - + do = "dragon-out"; - + "g~" = "cd"; gh = "cd"; "g/" = "/"; - + ee = "editor-open"; V = ''$${pkgs.bat}/bin/bat --paging=always --theme=gruvbox "$f"''; - + }; - + settings = { preview = true; hidden = true; @@ -55,32 +59,31 @@ in icons = true; ignorecase = true; }; - - extraConfig = - let - previewer = - pkgs.writeShellScriptBin "pv.sh" '' - file=$1 - w=$2 - h=$3 - x=$4 - y=$5 - - if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then - ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty - exit 1 - fi - - ${pkgs.pistol}/bin/pistol "$file" + + extraConfig = + let + previewer = pkgs.writeShellScriptBin "pv.sh" '' + file=$1 + w=$2 + h=$3 + x=$4 + y=$5 + + if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then + ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty + exit 1 + fi + + ${pkgs.pistol}/bin/pistol "$file" + ''; + cleaner = pkgs.writeShellScriptBin "clean.sh" '' + ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty + ''; + in + '' + set cleaner ${cleaner}/bin/clean.sh + set previewer ${previewer}/bin/pv.sh ''; - cleaner = pkgs.writeShellScriptBin "clean.sh" '' - ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty - ''; - in - '' - set cleaner ${cleaner}/bin/clean.sh - set previewer ${previewer}/bin/pv.sh - ''; }; }; } diff --git a/modules/home-manager/webapps.nix b/modules/home-manager/webapps.nix index 313d2d7..903ee9e 100644 --- a/modules/home-manager/webapps.nix +++ b/modules/home-manager/webapps.nix @@ -1,4 +1,9 @@ -{ lib, pkgs, config, ... }: +{ + lib, + pkgs, + config, + ... +}: let browser = lib.getExe pkgs.firefox; inherit (lib) mkIf mkOption types; diff --git a/modules/home-manager/wm/hyprland.nix b/modules/home-manager/wm/hyprland.nix index 3107f17..07e35ac 100644 --- a/modules/home-manager/wm/hyprland.nix +++ b/modules/home-manager/wm/hyprland.nix @@ -1,4 +1,10 @@ -{ lib, config, pkgs, smayzy, ... }: +{ + lib, + config, + pkgs, + smayzy, + ... +}: let mkIf = lib.mkIf; in @@ -54,12 +60,12 @@ in }; }) ]; - + systemd.user.services.hypr-wallpaper = { Unit = { Description = "Wallpaper auto-changer"; }; - + Service = { ExecStart = "${pkgs.bash}/bin/bash /home/smayzy/.config/hypr/wallpaper.sh"; Restart = "always"; @@ -69,4 +75,3 @@ in }; } - diff --git a/modules/nix/audio/pipewire.nix b/modules/nix/audio/pipewire.nix index 3c65741..bd5248f 100644 --- a/modules/nix/audio/pipewire.nix +++ b/modules/nix/audio/pipewire.nix @@ -8,7 +8,7 @@ in default = false; description = "audio settings"; }; - + config = mkIf config.smayzy.audio.enable { services.pulseaudio.enable = false; security.rtkit.enable = true; diff --git a/modules/nix/base-cli/fzf.nix b/modules/nix/base-cli/fzf.nix index ee71083..23b2dd2 100644 --- a/modules/nix/base-cli/fzf.nix +++ b/modules/nix/base-cli/fzf.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ...}: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/base-cli/nh.nix b/modules/nix/base-cli/nh.nix index 2e558a6..093eeda 100644 --- a/modules/nix/base-cli/nh.nix +++ b/modules/nix/base-cli/nh.nix @@ -1,4 +1,4 @@ -{ config, lib, ...}: +{ config, lib, ... }: let inherit (lib) mkIf mkOption types; in @@ -12,11 +12,11 @@ in config = mkIf config.smayzy.nh.enable { programs.nh = { enable = true; - clean= { + clean = { enable = true; extraArgs = "--keep 10"; dates = "hourly"; - }; + }; flake = "/home/smayzy/nix-config"; }; }; diff --git a/modules/nix/base-cli/nvf.nix b/modules/nix/base-cli/nvf.nix index 3d7edf7..2540bd1 100644 --- a/modules/nix/base-cli/nvf.nix +++ b/modules/nix/base-cli/nvf.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -8,7 +13,7 @@ in default = false; description = "nvf config"; }; - + config = mkIf config.smayzy.nvf.enable { programs.nvf = { enable = true; @@ -25,14 +30,14 @@ in clang.enable = true; rust.enable = true; }; - theme = { - enable = true; - name = lib.mkDefault "dracula"; - }; + theme = { + enable = true; + name = lib.mkDefault "dracula"; + }; treesitter.enable = true; - statusline.lualine.enable = true; - telescope.enable = true; - autocomplete.nvim-cmp.enable = true; + statusline.lualine.enable = true; + telescope.enable = true; + autocomplete.nvim-cmp.enable = true; }; }; }; diff --git a/modules/nix/base-cli/pkgs.nix b/modules/nix/base-cli/pkgs.nix index 035106c..066db80 100644 --- a/modules/nix/base-cli/pkgs.nix +++ b/modules/nix/base-cli/pkgs.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ...}: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/base/base.nix b/modules/nix/base/base.nix index 5dfed36..6dbfc68 100644 --- a/modules/nix/base/base.nix +++ b/modules/nix/base/base.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/browser/firefox.nix b/modules/nix/browser/firefox.nix index b51910e..612e97a 100644 --- a/modules/nix/browser/firefox.nix +++ b/modules/nix/browser/firefox.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/browser/floorp.nix b/modules/nix/browser/floorp.nix index 71b8210..36fceb4 100644 --- a/modules/nix/browser/floorp.nix +++ b/modules/nix/browser/floorp.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -10,6 +15,6 @@ in }; config = mkIf config.smayzy.floorp.enable { - environment.systemPackages = with pkgs; [ floorp ]; + environment.systemPackages = with pkgs; [ floorp ]; }; } diff --git a/modules/nix/browser/librewolf.nix b/modules/nix/browser/librewolf.nix index 5c4a335..1402d62 100644 --- a/modules/nix/browser/librewolf.nix +++ b/modules/nix/browser/librewolf.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -10,6 +15,6 @@ in }; config = mkIf config.smayzy.librewolf.enable { - environment.systemPackages = with pkgs; [ librewolf ]; + environment.systemPackages = with pkgs; [ librewolf ]; }; } diff --git a/modules/nix/cad/freecad.nix b/modules/nix/cad/freecad.nix index 6443104..fd93f2a 100644 --- a/modules/nix/cad/freecad.nix +++ b/modules/nix/cad/freecad.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/cad/fritzing.nix b/modules/nix/cad/fritzing.nix index 79c6701..28a8b35 100644 --- a/modules/nix/cad/fritzing.nix +++ b/modules/nix/cad/fritzing.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/comm/element.nix b/modules/nix/comm/element.nix index 2402b50..cca8d53 100644 --- a/modules/nix/comm/element.nix +++ b/modules/nix/comm/element.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/comm/thunderbird.nix b/modules/nix/comm/thunderbird.nix index 57035ed..0d155bf 100644 --- a/modules/nix/comm/thunderbird.nix +++ b/modules/nix/comm/thunderbird.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/comm/webcord.nix b/modules/nix/comm/webcord.nix index 5c632fa..d76bac7 100644 --- a/modules/nix/comm/webcord.nix +++ b/modules/nix/comm/webcord.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/de/kde.nix b/modules/nix/de/kde.nix index f7b487d..3392a22 100644 --- a/modules/nix/de/kde.nix +++ b/modules/nix/de/kde.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/default.nix b/modules/nix/default.nix index cf07713..cdac769 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -28,22 +28,27 @@ i18n.defaultLocale = "en_US.UTF-8"; time.timeZone = "Europe/Paris"; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-unwrapped" - "steam-run" - "obsidian" - "nvidia-x11" - "nvidia-settings" - ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-unwrapped" + "steam-run" + "obsidian" + "nvidia-x11" + "nvidia-settings" + ]; services.xserver.xkb = { layout = "fr"; variant = ""; }; console.keyMap = "fr"; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; networking.networkmanager.enable = true; } diff --git a/modules/nix/displaymanager/sddm.nix b/modules/nix/displaymanager/sddm.nix index 2ea1902..bcf6bf5 100644 --- a/modules/nix/displaymanager/sddm.nix +++ b/modules/nix/displaymanager/sddm.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/ebook/calibre.nix b/modules/nix/ebook/calibre.nix index 2437456..e2e718b 100644 --- a/modules/nix/ebook/calibre.nix +++ b/modules/nix/ebook/calibre.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/flatpak/flatpak.nix b/modules/nix/flatpak/flatpak.nix index 12c6818..1d25669 100644 --- a/modules/nix/flatpak/flatpak.nix +++ b/modules/nix/flatpak/flatpak.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; @@ -21,10 +21,10 @@ let ]; flatpaks = - (if config.smayzy.flatpak.gaming.enable then gaming else []) - ++ (if config.smayzy.flatpak.dev.enable then dev else []) - ++ (if config.smayzy.flatpak.utils.enable then utils else []) - ++ (if config.smayzy.flatpak.media.enable then media else []); + (if config.smayzy.flatpak.gaming.enable then gaming else [ ]) + ++ (if config.smayzy.flatpak.dev.enable then dev else [ ]) + ++ (if config.smayzy.flatpak.utils.enable then utils else [ ]) + ++ (if config.smayzy.flatpak.media.enable then media else [ ]); in { options.smayzy.flatpak = mkOption { @@ -35,25 +35,25 @@ in default = false; description = "enable flatpak support"; }; - + gaming.enable = mkOption { type = types.bool; default = false; description = "enable gaming flatpaks"; }; - + dev.enable = mkOption { type = types.bool; default = false; description = "enable dev flatpaks"; }; - + utils.enable = mkOption { type = types.bool; default = true; description = "enable utils flatpak"; }; - + media.enable = mkOption { type = types.bool; default = false; diff --git a/modules/nix/games/prism.nix b/modules/nix/games/prism.nix index 492c061..bbd37b2 100644 --- a/modules/nix/games/prism.nix +++ b/modules/nix/games/prism.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/games/steam.nix b/modules/nix/games/steam.nix index 319d244..d5d1c78 100644 --- a/modules/nix/games/steam.nix +++ b/modules/nix/games/steam.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/groups/base.nix b/modules/nix/groups/base.nix index 518769c..80d4611 100644 --- a/modules/nix/groups/base.nix +++ b/modules/nix/groups/base.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index 0f26509..a4e5811 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/groups/laptop.nix b/modules/nix/groups/laptop.nix index aa82c81..81cb615 100644 --- a/modules/nix/groups/laptop.nix +++ b/modules/nix/groups/laptop.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, ... }: let inherit (lib) mkIf mkOption types; in @@ -20,7 +20,7 @@ in floorp.enable = true; stylix.enable = true; audio.enable = true; - office.enable= true; + office.enable = true; webcord.enable = true; element.enable = true; sddm.enable = true; diff --git a/modules/nix/hardware/grub.nix b/modules/nix/hardware/grub.nix index fc418f4..3bc5ff8 100644 --- a/modules/nix/hardware/grub.nix +++ b/modules/nix/hardware/grub.nix @@ -1,6 +1,6 @@ { config, lib, ... }: - with lib; +with lib; { options.smayzy.grub-on-lap.enable = mkOption { @@ -8,8 +8,8 @@ default = false; description = "make grub works on this piece of shit laptop that can't boot normally"; }; - - config = { + + config = { boot.loader.systemd-boot.enable = false; boot.loader.grub.enable = true; boot.loader.grub.efiSupport = true; @@ -19,4 +19,4 @@ boot.loader.efi.canTouchEfiVariables = mkIf (!config.smayzy.grub-on-lap.enable) true; }; -} +} diff --git a/modules/nix/hardware/power.nix b/modules/nix/hardware/power.nix index b6acb8c..928906c 100644 --- a/modules/nix/hardware/power.nix +++ b/modules/nix/hardware/power.nix @@ -1,7 +1,15 @@ { config, lib, ... }: let - inherit (lib) mkIf mkOption types mkMerge; - validOptions = [ "desktop" "laptop" ]; + inherit (lib) + mkIf + mkOption + types + mkMerge + ; + validOptions = [ + "desktop" + "laptop" + ]; in { options.smayzy.power = mkOption { @@ -17,8 +25,8 @@ in enable = true; settings = { charger = { - governor = "performance"; - turbo = "auto"; + governor = "performance"; + turbo = "auto"; }; }; }; @@ -32,15 +40,15 @@ in settings = { CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - + CPU_MIN_PERF_ON_AC = 0; CPU_MAX_PERF_ON_AC = 100; CPU_MIN_PERF_ON_BAT = 0; CPU_MAX_PERF_ON_BAT = 100; - + STOP_CHARGE_THRESH_BAT0 = 95; }; }; diff --git a/modules/nix/ide/arduino.nix b/modules/nix/ide/arduino.nix index 775c9ea..0746cdd 100644 --- a/modules/nix/ide/arduino.nix +++ b/modules/nix/ide/arduino.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/aegisub.nix b/modules/nix/office/aegisub.nix index 5ad0837..f6f4230 100644 --- a/modules/nix/office/aegisub.nix +++ b/modules/nix/office/aegisub.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/blender.nix b/modules/nix/office/blender.nix index e633835..488eb45 100644 --- a/modules/nix/office/blender.nix +++ b/modules/nix/office/blender.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/inkscape.nix b/modules/nix/office/inkscape.nix index 1e68d37..22dcd37 100644 --- a/modules/nix/office/inkscape.nix +++ b/modules/nix/office/inkscape.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/kdenlive.nix b/modules/nix/office/kdenlive.nix index 7e42c74..b7d00d7 100644 --- a/modules/nix/office/kdenlive.nix +++ b/modules/nix/office/kdenlive.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/komikku.nix b/modules/nix/office/komikku.nix index 51291d8..b1c76d9 100644 --- a/modules/nix/office/komikku.nix +++ b/modules/nix/office/komikku.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/obsidian.nix b/modules/nix/office/obsidian.nix index 189e69a..f2b5c37 100644 --- a/modules/nix/office/obsidian.nix +++ b/modules/nix/office/obsidian.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/office/office.nix b/modules/nix/office/office.nix index 0d9c5d2..8f3b378 100644 --- a/modules/nix/office/office.nix +++ b/modules/nix/office/office.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/rice/stylix.nix b/modules/nix/rice/stylix.nix index 32b6ca7..1f57a55 100644 --- a/modules/nix/rice/stylix.nix +++ b/modules/nix/rice/stylix.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/shell/zsh.nix b/modules/nix/shell/zsh.nix index 611b3ea..8975a14 100644 --- a/modules/nix/shell/zsh.nix +++ b/modules/nix/shell/zsh.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/terminal/alacritty.nix b/modules/nix/terminal/alacritty.nix index 9049ce4..aa1fab7 100644 --- a/modules/nix/terminal/alacritty.nix +++ b/modules/nix/terminal/alacritty.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/utilities/gui-utilities.nix b/modules/nix/utilities/gui-utilities.nix index b73a35d..d4dde55 100644 --- a/modules/nix/utilities/gui-utilities.nix +++ b/modules/nix/utilities/gui-utilities.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/utilities/mouse.nix b/modules/nix/utilities/mouse.nix index b4bbcf0..155b6f5 100644 --- a/modules/nix/utilities/mouse.nix +++ b/modules/nix/utilities/mouse.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/virt/qemu.nix b/modules/nix/virt/qemu.nix index 6143007..4abbb02 100644 --- a/modules/nix/virt/qemu.nix +++ b/modules/nix/virt/qemu.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -11,13 +16,13 @@ in config = mkIf config.smayzy.virt.enable { programs.virt-manager.enable = true; - users.groups.libvirtd.members = ["smayzy"]; + users.groups.libvirtd.members = [ "smayzy" ]; virtualisation.libvirtd.enable = true; virtualisation.libvirtd.qemu.runAsRoot = false; virtualisation.libvirtd.qemu.ovmf.enable = true; environment.systemPackages = with pkgs; [ - qemu_kvm + qemu_kvm ]; # https://wiki.nixos.org/wiki/QEMU diff --git a/modules/nix/vpn/mullvad.nix b/modules/nix/vpn/mullvad.nix index a1bac58..1f939b3 100644 --- a/modules/nix/vpn/mullvad.nix +++ b/modules/nix/vpn/mullvad.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/vpn/tor.nix b/modules/nix/vpn/tor.nix index 516e9b5..cc5a90f 100644 --- a/modules/nix/vpn/tor.nix +++ b/modules/nix/vpn/tor.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/vpn/wireguard.nix b/modules/nix/vpn/wireguard.nix index 1b831a5..1d77053 100644 --- a/modules/nix/vpn/wireguard.nix +++ b/modules/nix/vpn/wireguard.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in diff --git a/modules/nix/wm/hyprland.nix b/modules/nix/wm/hyprland.nix index 32596da..f966bd7 100644 --- a/modules/nix/wm/hyprland.nix +++ b/modules/nix/wm/hyprland.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: let inherit (lib) mkIf mkOption types; in @@ -14,10 +19,10 @@ in enable = true; xwayland.enable = true; }; - + xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - + fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ]; environment.systemPackages = with pkgs; [