diff --git a/flake.nix b/flake.nix index 889236b..578608a 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ copyparty.url = "github:9001/copyparty"; }; - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } + outputs = inputs @ {flake-parts, ...}: + flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); } diff --git a/modules/base/boot.nix b/modules/base/boot.nix index de6144f..e196a83 100644 --- a/modules/base/boot.nix +++ b/modules/base/boot.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/base/eza.nix b/modules/base/eza.nix index 989f65e..5c4605c 100644 --- a/modules/base/eza.nix +++ b/modules/base/eza.nix @@ -1,8 +1,6 @@ -{ ... }: - -{ - flake.modules.nixos.base = { pkgs, ... }: { - environment.systemPackages = [ pkgs.eza ]; +{...}: { + flake.modules.nixos.base = {pkgs, ...}: { + environment.systemPackages = [pkgs.eza]; environment.shellAliases = { "eza" = "${pkgs.eza}/bin/eza -lah --sort=type --icons=auto"; "ls" = "${pkgs.eza}/bin/eza"; diff --git a/modules/base/fish.nix b/modules/base/fish.nix index 92ad18e..7757ac9 100644 --- a/modules/base/fish.nix +++ b/modules/base/fish.nix @@ -1,7 +1,5 @@ -{ config, ... }: - -{ - flake.modules.nixos.base = { pkgs, ... }: { +{config, ...}: { + flake.modules.nixos.base = {pkgs, ...}: { programs.fish.enable = true; users.users.${config.flake.meta.user.name}.shell = pkgs.fish; documentation.man.generateCaches = false; diff --git a/modules/base/gh.nix b/modules/base/gh.nix index cc9f279..370983a 100644 --- a/modules/base/gh.nix +++ b/modules/base/gh.nix @@ -1,8 +1,6 @@ -{ ... }: - -{ - flake.modules.nixos.base = { pkgs, ... }: { - environment.systemPackages = [ pkgs.gh ]; +{...}: { + flake.modules.nixos.base = {pkgs, ...}: { + environment.systemPackages = [pkgs.gh]; }; flake.modules.homeManager.base = { diff --git a/modules/base/git.nix b/modules/base/git.nix index 9233f60..378596f 100644 --- a/modules/base/git.nix +++ b/modules/base/git.nix @@ -1,10 +1,7 @@ -{ config, ... }: - -let +{config, ...}: let userName = config.flake.meta.git.name or config.flake.meta.user.name or ""; userEmail = config.flake.meta.git.email or config.flake.meta.user.email or ""; -in -{ +in { flake.modules.nixos.base = { programs.git.enable = true; }; diff --git a/modules/base/home-manager.nix b/modules/base/home-manager.nix index 5e93435..62608c3 100644 --- a/modules/base/home-manager.nix +++ b/modules/base/home-manager.nix @@ -1,9 +1,11 @@ -{ inputs, config, ... }: - { + inputs, + config, + ... +}: { flake.modules.nixos.base = { - imports = [ inputs.home-manager.nixosModules.home-manager ]; - + imports = [inputs.home-manager.nixosModules.home-manager]; + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.${config.flake.meta.user.name} = { diff --git a/modules/base/kernel.nix b/modules/base/kernel.nix index b038e14..9e17791 100644 --- a/modules/base/kernel.nix +++ b/modules/base/kernel.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ - flake.modules.nixos.base = { pkgs, ... }: { +{...}: { + flake.modules.nixos.base = {pkgs, ...}: { boot.kernelPackages = pkgs.linuxPackages_latest; }; } diff --git a/modules/base/networking.nix b/modules/base/networking.nix index 3218990..4f01d53 100644 --- a/modules/base/networking.nix +++ b/modules/base/networking.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { networking.networkmanager.enable = true; networking.firewall.enable = false; diff --git a/modules/base/nh.nix b/modules/base/nh.nix index bb88300..659f614 100644 --- a/modules/base/nh.nix +++ b/modules/base/nh.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.base = { programs.nh = { enable = true; diff --git a/modules/base/nix.nix b/modules/base/nix.nix index 92e6c6c..45b97a2 100644 --- a/modules/base/nix.nix +++ b/modules/base/nix.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; }; } diff --git a/modules/base/region.nix b/modules/base/region.nix index dfb5518..6b87930 100644 --- a/modules/base/region.nix +++ b/modules/base/region.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { time.timeZone = "Asia/Jerusalem"; diff --git a/modules/base/sops.nix b/modules/base/sops.nix index c876a56..55b41e3 100644 --- a/modules/base/sops.nix +++ b/modules/base/sops.nix @@ -1,7 +1,5 @@ -{ inputs, ... }: - -{ - flake.modules.nixos.base = { pkgs, ... }: { +{inputs, ...}: { + flake.modules.nixos.base = {pkgs, ...}: { imports = [ inputs.sops-nix.nixosModules.sops ]; diff --git a/modules/base/starship.nix b/modules/base/starship.nix index 06fa941..47a1568 100644 --- a/modules/base/starship.nix +++ b/modules/base/starship.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { programs.starship.enable = true; }; diff --git a/modules/base/state-version.nix b/modules/base/state-version.nix index c12da07..08ea965 100644 --- a/modules/base/state-version.nix +++ b/modules/base/state-version.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.base = { system.stateVersion = "${config.flake.meta.stateVersion}"; }; diff --git a/modules/base/stylix/impl.nix b/modules/base/stylix/impl.nix index 8091431..b376427 100644 --- a/modules/base/stylix/impl.nix +++ b/modules/base/stylix/impl.nix @@ -1,9 +1,11 @@ -{ inputs, lib, ... }: - { - flake.modules.nixos.base = { pkgs, ... }: { - imports = [ inputs.stylix.nixosModules.stylix ]; - + inputs, + lib, + ... +}: { + flake.modules.nixos.base = {pkgs, ...}: { + imports = [inputs.stylix.nixosModules.stylix]; + stylix = { enable = true; image = ./wallpaper.jpeg; diff --git a/modules/base/unfree.nix b/modules/base/unfree.nix index 0869d02..4597c26 100644 --- a/modules/base/unfree.nix +++ b/modules/base/unfree.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { nixpkgs.config.allowUnfree = true; }; diff --git a/modules/base/user.nix b/modules/base/user.nix index 6e12d2b..063eaa1 100644 --- a/modules/base/user.nix +++ b/modules/base/user.nix @@ -1,11 +1,9 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.base = { users.users.${config.flake.meta.user.name} = { isNormalUser = true; description = "${config.flake.meta.user.name}"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = ["networkmanager" "wheel"]; packages = []; }; }; diff --git a/modules/base/zoxide.nix b/modules/base/zoxide.nix index d2f2e47..0eeb2b9 100644 --- a/modules/base/zoxide.nix +++ b/modules/base/zoxide.nix @@ -1,10 +1,8 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.base = { programs.zoxide = { enable = true; - + enableZshIntegration = true; enableBashIntegration = true; enableFishIntegration = true; diff --git a/modules/desktop/apps/claude.nix b/modules/desktop/apps/claude.nix index 48053c0..00f114f 100644 --- a/modules/desktop/apps/claude.nix +++ b/modules/desktop/apps/claude.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = [ pkgs.claude-code ]; +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { + environment.systemPackages = [pkgs.claude-code]; }; } diff --git a/modules/desktop/apps/discord.nix b/modules/desktop/apps/discord.nix index 0f44483..0c0bfa5 100644 --- a/modules/desktop/apps/discord.nix +++ b/modules/desktop/apps/discord.nix @@ -1,13 +1,10 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: let - discord = (pkgs.discord.override { +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: let + discord = pkgs.discord.override { withOpenASAR = true; withVencord = true; - }); - in - { - environment.systemPackages = [ discord ]; + }; + in { + environment.systemPackages = [discord]; }; } diff --git a/modules/desktop/apps/firefox.nix b/modules/desktop/apps/firefox.nix index ff40ea2..cbeac0e 100644 --- a/modules/desktop/apps/firefox.nix +++ b/modules/desktop/apps/firefox.nix @@ -1,15 +1,17 @@ -{ inputs, config, ... }: - { + inputs, + config, + ... +}: { flake.modules.nixos.desktop = { programs.firefox.enable = true; }; - flake.modules.homeManager.desktop = { pkgs, ... }: let + flake.modules.homeManager.desktop = {pkgs, ...}: let system = pkgs.stdenv.hostPlatform.system; ff-addons = inputs.firefox-addons.packages.${system}; in { - stylix.targets.firefox.profileNames = [ config.flake.meta.user.name ]; + stylix.targets.firefox.profileNames = [config.flake.meta.user.name]; programs.firefox = { enable = true; profiles.${config.flake.meta.user.name} = { @@ -22,10 +24,17 @@ ]; search.engines = { "Unduck" = { - urls = [{ - template = "https://unduck.link"; - params = [ { name = "q"; value = "{searchTerms}"; } ]; - }]; + urls = [ + { + template = "https://unduck.link"; + params = [ + { + name = "q"; + value = "{searchTerms}"; + } + ]; + } + ]; definedAliases = ["@un"]; }; }; diff --git a/modules/desktop/apps/ghostty.nix b/modules/desktop/apps/ghostty.nix index ee4c3c5..25293af 100644 --- a/modules/desktop/apps/ghostty.nix +++ b/modules/desktop/apps/ghostty.nix @@ -1,8 +1,6 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = [ pkgs.ghostty ]; +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { + environment.systemPackages = [pkgs.ghostty]; }; flake.modules.homeManager.desktop = { diff --git a/modules/desktop/apps/halloy.nix b/modules/desktop/apps/halloy.nix index 0a40e85..3fe531b 100644 --- a/modules/desktop/apps/halloy.nix +++ b/modules/desktop/apps/halloy.nix @@ -1,15 +1,13 @@ -{ config, ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = [ pkgs.halloy ]; +{config, ...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { + environment.systemPackages = [pkgs.halloy]; sops.secrets."irc/password" = { owner = config.flake.meta.user.name; }; }; - flake.modules.homeManager.desktop = { lib, ... }: { + flake.modules.homeManager.desktop = {lib, ...}: { programs.halloy = { enable = true; settings = { @@ -26,11 +24,10 @@ use_tls = false; dangerously_accept_invalid_certs = true; - sasl.plain = - lib.mkIf (config.flake.meta.irc.server.isBouncer or false) { - username = config.flake.meta.user.name; - password_file = "/run/secrets/irc/password"; - }; + sasl.plain = lib.mkIf (config.flake.meta.irc.server.isBouncer or false) { + username = config.flake.meta.user.name; + password_file = "/run/secrets/irc/password"; + }; }; buffer.chathistory = { diff --git a/modules/desktop/apps/localsend.nix b/modules/desktop/apps/localsend.nix index f09a855..29c2790 100644 --- a/modules/desktop/apps/localsend.nix +++ b/modules/desktop/apps/localsend.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = [ pkgs.localsend ]; +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { + environment.systemPackages = [pkgs.localsend]; }; } diff --git a/modules/desktop/apps/notion.nix b/modules/desktop/apps/notion.nix index 50d4dcc..be372dd 100644 --- a/modules/desktop/apps/notion.nix +++ b/modules/desktop/apps/notion.nix @@ -1,9 +1,7 @@ -{ self, ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: let +{self, ...}: { + flake.modules.nixos.desktop = {pkgs, ...}: let system = pkgs.stdenv.hostPlatform.system; in { - environment.systemPackages = [ self.packages.${system}.notion ]; + environment.systemPackages = [self.packages.${system}.notion]; }; } diff --git a/modules/desktop/apps/spotify.nix b/modules/desktop/apps/spotify.nix index c1a1077..68a3856 100644 --- a/modules/desktop/apps/spotify.nix +++ b/modules/desktop/apps/spotify.nix @@ -1,7 +1,5 @@ -{ inputs, ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: let +{inputs, ...}: { + flake.modules.nixos.desktop = {pkgs, ...}: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { imports = [ diff --git a/modules/desktop/apps/steam.nix b/modules/desktop/apps/steam.nix index 2e72775..9b75697 100644 --- a/modules/desktop/apps/steam.nix +++ b/modules/desktop/apps/steam.nix @@ -1,10 +1,8 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { programs.steam = { enable = true; - + remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; localNetworkGameTransfers.openFirewall = true; diff --git a/modules/desktop/apps/telegram.nix b/modules/desktop/apps/telegram.nix index 1a79713..2b187ba 100644 --- a/modules/desktop/apps/telegram.nix +++ b/modules/desktop/apps/telegram.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { - environment.systemPackages = [ pkgs.telegram-desktop ]; +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { + environment.systemPackages = [pkgs.telegram-desktop]; }; } diff --git a/modules/desktop/apps/u2c.nix b/modules/desktop/apps/u2c.nix index cd1ff79..d5dcf5e 100644 --- a/modules/desktop/apps/u2c.nix +++ b/modules/desktop/apps/u2c.nix @@ -1,9 +1,7 @@ -{ self, ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: let +{self, ...}: { + flake.modules.nixos.desktop = {pkgs, ...}: let system = pkgs.stdenv.hostPlatform.system; in { - environment.systemPackages = [ self.packages.${system}.u2c ]; + environment.systemPackages = [self.packages.${system}.u2c]; }; } diff --git a/modules/desktop/environments/gnome.nix b/modules/desktop/environments/gnome.nix index 0b0aade..4c0edf8 100644 --- a/modules/desktop/environments/gnome.nix +++ b/modules/desktop/environments/gnome.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { services.xserver.enable = true; services.desktopManager.gnome.enable = false; diff --git a/modules/desktop/environments/niri.nix b/modules/desktop/environments/niri.nix index 2a36a3d..fba5002 100644 --- a/modules/desktop/environments/niri.nix +++ b/modules/desktop/environments/niri.nix @@ -1,7 +1,5 @@ -{ inputs, ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: let +{inputs, ...}: { + flake.modules.nixos.desktop = {pkgs, ...}: let niri-unstable = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable; in { imports = [ @@ -16,13 +14,17 @@ ]; }; - flake.modules.homeManager.desktop = { pkgs, lib, ... }: let + flake.modules.homeManager.desktop = { + pkgs, + lib, + ... + }: let noctalia-pkg = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; noctalia-shell = "${noctalia-pkg}/bin/noctalia-shell"; ghostty = "${pkgs.ghostty}/bin/ghostty"; playerctl = "${pkgs.playerctl}/bin/playerctl"; yazi = "${pkgs.yazi}/bin/yazi"; - noctalia = cmd: [ noctalia-shell "ipc" "call" ] ++ (pkgs.lib.splitString " " cmd); + noctalia = cmd: [noctalia-shell "ipc" "call"] ++ (pkgs.lib.splitString " " cmd); xws-unstable = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable; in { programs.niri.settings.xwayland-satellite.enable = true; @@ -31,10 +33,12 @@ environment."NIXOS_OZONE_WL" = "1"; prefer-no-csd = true; input.keyboard.numlock = true; - layer-rules = [ { - matches = [ { namespace = "^noctalia-overview*"; } ]; - place-within-backdrop = true; - } ]; + layer-rules = [ + { + matches = [{namespace = "^noctalia-overview*";}]; + place-within-backdrop = true; + } + ]; binds = { "Mod+Shift+S".action.screenshot = []; "Mod+Shift+Q".action.spawn = noctalia "sessionMenu toggle"; @@ -93,11 +97,11 @@ "Mod+Shift+Equal".action.set-window-height = "+10%"; "Mod+O".action.toggle-overview = []; - - "Mod+E".action.spawn = [ ghostty "-e" yazi ]; + + "Mod+E".action.spawn = [ghostty "-e" yazi]; }; spawn-at-startup = [ - { command = [ noctalia-shell ]; } + {command = [noctalia-shell];} ]; hotkey-overlay.skip-at-startup = true; }; diff --git a/modules/desktop/face.nix b/modules/desktop/face.nix index 53ce967..9fe8c2c 100644 --- a/modules/desktop/face.nix +++ b/modules/desktop/face.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.homeManager.desktop = { home.file.".face".source = config.flake.meta.user.face; }; diff --git a/modules/desktop/gdm.nix b/modules/desktop/gdm.nix index 6c6a111..34c77c1 100644 --- a/modules/desktop/gdm.nix +++ b/modules/desktop/gdm.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { services.displayManager.gdm.enable = true; }; diff --git a/modules/desktop/layouts.nix b/modules/desktop/layouts.nix index df4d2e3..3d4cc24 100644 --- a/modules/desktop/layouts.nix +++ b/modules/desktop/layouts.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { services.xserver.xkb = { layout = "us,il"; diff --git a/modules/desktop/noctalia.nix b/modules/desktop/noctalia.nix index 4ced586..bfb1d10 100644 --- a/modules/desktop/noctalia.nix +++ b/modules/desktop/noctalia.nix @@ -1,7 +1,9 @@ -{ config, inputs, ... }: - { - flake.modules.nixos.desktop = { pkgs, ... }: { + config, + inputs, + ... +}: { + flake.modules.nixos.desktop = {pkgs, ...}: { environment.systemPackages = [ inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default ]; @@ -35,16 +37,23 @@ position = "left"; widgets = { left = [ - { id = "ControlCenter"; useDistroLogo = true; } - { id = "Network"; } - { id = "Bluetooth"; } + { + id = "ControlCenter"; + useDistroLogo = true; + } + {id = "Network";} + {id = "Bluetooth";} ]; center = [ - { id = "Workspace"; hideUnoccupied = true; labelMode = "none"; } + { + id = "Workspace"; + hideUnoccupied = true; + labelMode = "none"; + } ]; right = [ - { id = "KeyboardLayout"; } - { id = "Tray"; } + {id = "KeyboardLayout";} + {id = "Tray";} { id = "Battery"; alwaysShowPercentage = true; diff --git a/modules/desktop/printing.nix b/modules/desktop/printing.nix index 2640e70..5965b82 100644 --- a/modules/desktop/printing.nix +++ b/modules/desktop/printing.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { services.printing.enable = true; }; diff --git a/modules/desktop/sound.nix b/modules/desktop/sound.nix index dcbacf8..7449bc0 100644 --- a/modules/desktop/sound.nix +++ b/modules/desktop/sound.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.desktop = { services.pulseaudio.enable = false; security.rtkit.enable = true; diff --git a/modules/desktop/udiskie.nix b/modules/desktop/udiskie.nix index 9adef55..0087758 100644 --- a/modules/desktop/udiskie.nix +++ b/modules/desktop/udiskie.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.homeManager.desktop = { services.udiskie.enable = true; services.udiskie.notify = true; diff --git a/modules/desktop/yazi.nix b/modules/desktop/yazi.nix index af82eee..3f596c5 100644 --- a/modules/desktop/yazi.nix +++ b/modules/desktop/yazi.nix @@ -1,10 +1,8 @@ -{ ... }: - -{ - flake.modules.nixos.desktop = { pkgs, ... }: { +{...}: { + flake.modules.nixos.desktop = {pkgs, ...}: { programs.yazi.enable = true; - environment.systemPackages = [ pkgs.mpv ]; + environment.systemPackages = [pkgs.mpv]; }; flake.modules.homeManager.desktop = { diff --git a/modules/flake-parts.nix b/modules/flake-parts.nix index 8945db5..4862091 100644 --- a/modules/flake-parts.nix +++ b/modules/flake-parts.nix @@ -1,6 +1,4 @@ -{ inputs, ... }: - -{ +{inputs, ...}: { systems = [ "x86_64-linux" ]; diff --git a/modules/hosts/jank/krembo/hardware.nix b/modules/hosts/jank/krembo/hardware.nix index 483fd5a..da12859 100644 --- a/modules/hosts/jank/krembo/hardware.nix +++ b/modules/hosts/jank/krembo/hardware.nix @@ -1,33 +1,37 @@ # 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. -{ ... }: +{...}: { + flake.modules.nixos.krembo = { + config, + lib, + pkgs, + modulesPath, + ... + }: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; -{ - flake.modules.nixos.krembo = { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/c0ed85ea-78bd-4613-91c4-86f5e8772561"; + fsType = "ext4"; + }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/c0ed85ea-78bd-4613-91c4-86f5e8772561"; - fsType = "ext4"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/BA16-88CF"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BA16-88CF"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/85a3e327-7e21-4489-a81a-79caf5c1ee09"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/85a3e327-7e21-4489-a81a-79caf5c1ee09";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedributableFirmware or true; diff --git a/modules/hosts/jank/krembo/home-manager.nix b/modules/hosts/jank/krembo/home-manager.nix index fa2b8eb..b42c844 100644 --- a/modules/hosts/jank/krembo/home-manager.nix +++ b/modules/hosts/jank/krembo/home-manager.nix @@ -1,7 +1,5 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.krembo = { - home-manager.users.${config.flake.meta.user.name}.imports = [ config.flake.modules.homeManager.krembo ]; + home-manager.users.${config.flake.meta.user.name}.imports = [config.flake.modules.homeManager.krembo]; }; } diff --git a/modules/hosts/jank/krembo/hostname.nix b/modules/hosts/jank/krembo/hostname.nix index d004ef9..6e2e856 100644 --- a/modules/hosts/jank/krembo/hostname.nix +++ b/modules/hosts/jank/krembo/hostname.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.krembo = { networking.hostName = "krembo"; }; diff --git a/modules/hosts/jank/krembo/krembo.nix b/modules/hosts/jank/krembo/krembo.nix index 228080a..dae4cc2 100644 --- a/modules/hosts/jank/krembo/krembo.nix +++ b/modules/hosts/jank/krembo/krembo.nix @@ -1,6 +1,8 @@ -{ inputs, config, ... }: - { + inputs, + config, + ... +}: { flake.nixosConfigurations.krembo = inputs.nixpkgs.lib.nixosSystem { modules = with config.flake.modules; [ nixos.krembo diff --git a/modules/hosts/jank/taki/hardware.nix b/modules/hosts/jank/taki/hardware.nix index 9bbc4ff..b565b85 100644 --- a/modules/hosts/jank/taki/hardware.nix +++ b/modules/hosts/jank/taki/hardware.nix @@ -1,33 +1,37 @@ # 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. -{ ... }: +{...}: { + flake.modules.nixos.taki = { + config, + lib, + pkgs, + modulesPath, + ... + }: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; -{ - flake.modules.nixos.taki = { config, lib, pkgs, modulesPath, ... }: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/b1830103-1e4a-4710-8aa6-f597a4ca46b3"; + fsType = "ext4"; + }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/b1830103-1e4a-4710-8aa6-f597a4ca46b3"; - fsType = "ext4"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/F3B7-DE6D"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F3B7-DE6D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/a74700a7-4c29-40cc-b0b4-50a171125dc1"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/a74700a7-4c29-40cc-b0b4-50a171125dc1";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/hosts/jank/taki/home-manager.nix b/modules/hosts/jank/taki/home-manager.nix index e861220..4cb4cd9 100644 --- a/modules/hosts/jank/taki/home-manager.nix +++ b/modules/hosts/jank/taki/home-manager.nix @@ -1,7 +1,5 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.taki = { - home-manager.users.${config.flake.meta.user.name}.imports = [ config.flake.modules.homeManager.taki ]; + home-manager.users.${config.flake.meta.user.name}.imports = [config.flake.modules.homeManager.taki]; }; } diff --git a/modules/hosts/jank/taki/hostname.nix b/modules/hosts/jank/taki/hostname.nix index b2a668e..186b714 100644 --- a/modules/hosts/jank/taki/hostname.nix +++ b/modules/hosts/jank/taki/hostname.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.taki = { networking.hostName = "taki"; }; diff --git a/modules/hosts/jank/taki/nixos-hardware.nix b/modules/hosts/jank/taki/nixos-hardware.nix index e6f3129..ee2af37 100644 --- a/modules/hosts/jank/taki/nixos-hardware.nix +++ b/modules/hosts/jank/taki/nixos-hardware.nix @@ -1,10 +1,12 @@ -{ ... }: +{...}: { + flake.modules.nixos.taki = { + pkgs, + config, + ... + }: { + hardware.firmware = [pkgs.sof-firmware]; -{ - flake.modules.nixos.taki = { pkgs, config, ... }: { - hardware.firmware = [ pkgs.sof-firmware ]; - - hardware.bluetooth.enable = true; + hardware.bluetooth.enable = true; hardware.graphics.extraPackages = with pkgs; [ intel-media-driver @@ -12,7 +14,7 @@ vpl-gpu-rt ]; services.fstrim.enable = true; - services.tlp.enable = (!config.services.power-profiles-daemon.enable); + services.tlp.enable = !config.services.power-profiles-daemon.enable; boot = { # Workaround: Out of the box, resuming from hibernation will break sounds. @@ -41,7 +43,7 @@ }; environment.variables = { - INTEL_DEBUG="no32"; + INTEL_DEBUG = "no32"; }; security.tpm2.enable = true; diff --git a/modules/hosts/jank/taki/taki.nix b/modules/hosts/jank/taki/taki.nix index db21d98..b6aa2a7 100644 --- a/modules/hosts/jank/taki/taki.nix +++ b/modules/hosts/jank/taki/taki.nix @@ -1,6 +1,8 @@ -{ inputs, config, ... }: - { + inputs, + config, + ... +}: { flake.nixosConfigurations.taki = inputs.nixpkgs.lib.nixosSystem { modules = with config.flake.modules; [ nixos.taki diff --git a/modules/hosts/krembo.nix b/modules/hosts/krembo.nix index 2833ddf..ac6bcd9 100644 --- a/modules/hosts/krembo.nix +++ b/modules/hosts/krembo.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.krembo.imports = with config.flake.modules.nixos; [ base server diff --git a/modules/hosts/taki.nix b/modules/hosts/taki.nix index e6cece3..f4ec3de 100644 --- a/modules/hosts/taki.nix +++ b/modules/hosts/taki.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.taki.imports = with config.flake.modules.nixos; [ base desktop diff --git a/modules/meta.nix b/modules/meta.nix index 818637a..4066d95 100644 --- a/modules/meta.nix +++ b/modules/meta.nix @@ -1,9 +1,6 @@ -{ lib, ... }: - -let +{lib, ...}: let inherit (lib) types; -in -{ +in { options.flake.meta = lib.mkOption { type = types.attrsOf types.anything; default = {}; diff --git a/modules/packages/notion.nix b/modules/packages/notion.nix index a2dcf0b..d8691e9 100644 --- a/modules/packages/notion.nix +++ b/modules/packages/notion.nix @@ -1,14 +1,17 @@ -{ ... }: - -{ - perSystem = { self', pkgs, lib, ... }: { +{...}: { + perSystem = { + self', + pkgs, + lib, + ... + }: { packages.notion-app = pkgs.writeShellScriptBin "notion-app" '' ${lib.getExe pkgs.chromium} --app=https://www.notion.so ''; packages.notion-icon = pkgs.stdenv.mkDerivation { name = "notion-icon"; - + src = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Notion-logo.svg"; hash = "sha256-G1KhhdgWbZM59cFt1ReJ7jD0mmW01Ac4KQtgQj4zEWA="; @@ -28,7 +31,7 @@ comment = "Productivity software"; desktopName = "Notion"; genericName = "Productivity software"; - categories = [ "Office" ]; + categories = ["Office"]; }; packages.notion = pkgs.symlinkJoin { diff --git a/modules/packages/u2c.nix b/modules/packages/u2c.nix index 05a1ffb..0118d7b 100644 --- a/modules/packages/u2c.nix +++ b/modules/packages/u2c.nix @@ -1,7 +1,5 @@ -{ ... }: - -{ - perSystem = { pkgs, ... }: { +{...}: { + perSystem = {pkgs, ...}: { packages.u2c = pkgs.stdenv.mkDerivation { name = "u2c"; version = "2.19"; @@ -18,7 +16,7 @@ chmod +x $out/bin/u2c ''; - buildInputs = [ pkgs.python3 ]; + buildInputs = [pkgs.python3]; meta = { description = "A fast uploader for Copyparty"; diff --git a/modules/server/cloudflared.nix b/modules/server/cloudflared.nix index e0b8899..eed619a 100644 --- a/modules/server/cloudflared.nix +++ b/modules/server/cloudflared.nix @@ -1,8 +1,6 @@ -{ config, ... }: - -{ - flake.modules.nixos.server = { pkgs, ... }: { - environment.systemPackages = [ pkgs.cloudflared ]; +{config, ...}: { + flake.modules.nixos.server = {pkgs, ...}: { + environment.systemPackages = [pkgs.cloudflared]; services.cloudflared.enable = config.flake.meta.web.domain.has; }; diff --git a/modules/server/copyparty.nix b/modules/server/copyparty.nix index 22cc424..a3dde82 100644 --- a/modules/server/copyparty.nix +++ b/modules/server/copyparty.nix @@ -1,10 +1,12 @@ -{ inputs, ... }@inp: - -let +{inputs, ...} @ inp: let flk = inp.config.flake; -in -{ - flake.modules.nixos.server = { pkgs, lib, config, ... }: { +in { + flake.modules.nixos.server = { + pkgs, + lib, + config, + ... + }: { imports = [ inputs.copyparty.nixosModules.default ]; @@ -16,7 +18,7 @@ in owner = config.services.copyparty.user; }; sops.secrets."cloudflare/copyparty" = {}; - + services.cloudflared.tunnels = lib.mkIf config.services.cloudflared.enable { "files" = { credentialsFile = "/run/secrets/cloudflare/copyparty"; @@ -29,15 +31,21 @@ in }; }; - nixpkgs.overlays = [ inputs.copyparty.overlays.default ]; - environment.systemPackages = [ pkgs.copyparty ]; - services.copyparty.settings.xff-hdr = if config.services.cloudflared.enable then "cf-connecting-ip" else null; - services.copyparty.settings.rproxy = if config.services.cloudflared.enable then 1 else null; + nixpkgs.overlays = [inputs.copyparty.overlays.default]; + environment.systemPackages = [pkgs.copyparty]; + services.copyparty.settings.xff-hdr = + if config.services.cloudflared.enable + then "cf-connecting-ip" + else null; + services.copyparty.settings.rproxy = + if config.services.cloudflared.enable + then 1 + else null; services.copyparty = { enable = true; settings = { i = "0.0.0.0"; - p = [ 3293 ]; + p = [3293]; e2d = true; e2t = true; @@ -51,20 +59,20 @@ in "/" = { path = "/var/lib/copyparty/data"; access = { - rwmd = [ "ilay" ]; - r = [ "ron" ]; + rwmd = ["ilay"]; + r = ["ron"]; }; }; "/ilay" = { path = "/var/lib/copyparty/data/ilay"; access = { - rwmd = [ "ilay" ]; + rwmd = ["ilay"]; }; }; "/ron" = { path = "/var/lib/copyparty/data/ron"; access = { - rwmd = [ "ron" ]; + rwmd = ["ron"]; }; }; }; diff --git a/modules/server/soju.nix b/modules/server/soju.nix index 1651afd..cd31aa6 100644 --- a/modules/server/soju.nix +++ b/modules/server/soju.nix @@ -1,6 +1,4 @@ -{ config, ... }: - -{ +{config, ...}: { flake.modules.nixos.server = { services.soju.enable = true; services.soju.listen = [ diff --git a/modules/server/ssh.nix b/modules/server/ssh.nix index 8e6d548..393b98d 100644 --- a/modules/server/ssh.nix +++ b/modules/server/ssh.nix @@ -1,6 +1,4 @@ -{ ... }: - -{ +{...}: { flake.modules.nixos.server = { services.openssh.enable = true; }; diff --git a/modules/settings.nix b/modules/settings.nix index 95bf695..3c5cec9 100644 --- a/modules/settings.nix +++ b/modules/settings.nix @@ -1,6 +1,4 @@ -{ ... }: - -rec { +{...}: rec { flake.meta.user = { name = "teesh"; email = "ilaylevy611@gmail.com";