diff --git a/flake.nix b/flake.nix index ae357d2..f1c43d5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,16 +42,16 @@ // { i3utils = i3utils.packages.${system}.default; hyprland = hyprland.packages."x86_64-linux".default.overrideAttrs (finalAttrs: previousAttrs: { - buildInputs = previousAttrs.buildInputs ++ [pkgs.makeWrapper]; - postInstall = '' - ls -lar $out - wrapProgram $out/bin/Hyprland \ - --set LIBVA_DRIVER_NAME nvidia \ - --set XDG_SESSION_TYPE wayland \ - --set __GLX_VENDOR_LIBRARY_NAME nvidia \ - --set WLR_NO_HARDWARE_CURSORS 1 - ''; - }); + buildInputs = previousAttrs.buildInputs ++ [pkgs.makeWrapper]; + postInstall = '' + ls -lar $out + wrapProgram $out/bin/Hyprland \ + --set LIBVA_DRIVER_NAME nvidia \ + --set XDG_SESSION_TYPE wayland \ + --set __GLX_VENDOR_LIBRARY_NAME nvidia \ + --set WLR_NO_HARDWARE_CURSORS 1 + ''; + }); }; lib = nixpkgs.lib; diff --git a/hosts/common/default.nix b/hosts/common/default.nix index b5975c9..f1c4911 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -4,7 +4,10 @@ lib, ... }: let - mkUser = {userName, uid}: { + mkUser = { + userName, + uid, + }: { isNormalUser = true; home = "/home/${userName}"; initialPassword = "password"; @@ -18,7 +21,6 @@ userName = "daniel"; uid = 1000; }; - in { # Use the systemd-boot EFI boot loader. boot.kernelPackages = pkgs.linuxPackages_latest; @@ -79,6 +81,7 @@ in { git htop helix + jq nnn ripgrep wget diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index 4b9d431..3a251c0 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -31,7 +31,7 @@ noto-fonts noto-fonts-cjk noto-fonts-emoji - (nerdfonts.override {fonts = ["Iosevka"]; }) + (nerdfonts.override {fonts = ["Iosevka"];}) ubuntu_font_family ]; @@ -61,8 +61,8 @@ ) ]; extraRules = '' -# Raspberry Pi Picoprobe -SUBSYSTEM="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0003", MODE="0666" + # Raspberry Pi Picoprobe + SUBSYSTEM="usb", ATTRS{idVendor}=="2e8a", ATTRS{idProduct}=="0003", MODE="0666" ''; }; diff --git a/modules/fail2ban/default.nix b/modules/fail2ban/default.nix index 2312953..70d066f 100644 --- a/modules/fail2ban/default.nix +++ b/modules/fail2ban/default.nix @@ -1,5 +1,4 @@ -{...}: -{ +{...}: { services.fail2ban = { enable = true; maxretry = 5; diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index 295b4ab..2eeff42 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -1,5 +1,8 @@ -{ config, pkgs, ... }: { + config, + pkgs, + ... +}: { services.gitea = { enable = true; appName = "The Broccoli Patch"; # Give the site a name diff --git a/modules/golink/default.nix b/modules/golink/default.nix index 4fce572..734c0d4 100644 --- a/modules/golink/default.nix +++ b/modules/golink/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: { +{...}: { services.golink = { enable = true; diff --git a/modules/livebook/default.nix b/modules/livebook/default.nix index ac38bd2..f9fd59b 100644 --- a/modules/livebook/default.nix +++ b/modules/livebook/default.nix @@ -1,14 +1,13 @@ -{ config, ... }: -{ +{config, ...}: { virtualisation.oci-containers = { backend = "docker"; containers = { "livebook" = { image = "ghcr.io/livebook-dev/livebook"; - ports = [ "8080:8080" "8081:8081" ]; - volumes = [ "/home/daniel/livebook/data:/data" ]; + ports = ["8080:8080" "8081:8081"]; + volumes = ["/home/daniel/livebook/data:/data"]; user = "${toString config.users.users."daniel".uid}:${toString config.users.groups."users".gid}"; - environmentFiles = [ "/home/daniel/.livebook_env" ]; + environmentFiles = ["/home/daniel/.livebook_env"]; }; }; }; diff --git a/users/daniel/configs/desktop/default.nix b/users/daniel/configs/desktop/default.nix index 1469641..23ab70c 100644 --- a/users/daniel/configs/desktop/default.nix +++ b/users/daniel/configs/desktop/default.nix @@ -7,7 +7,6 @@ ./waybar ]; - home.file = { ".age/age.txt" = { source = config.lib.file.mkOutOfStoreSymlink "/run/agenix/age_identity"; diff --git a/users/daniel/configs/system/nvim/default.nix b/users/daniel/configs/system/nvim/default.nix index 3b2780c..6a9fdc4 100644 --- a/users/daniel/configs/system/nvim/default.nix +++ b/users/daniel/configs/system/nvim/default.nix @@ -1,6 +1,4 @@ -{...}: - -{ +{...}: { programs.neovim.enable = true; home.file = { diff --git a/users/daniel/default.nix b/users/daniel/default.nix index 5793125..692941d 100644 --- a/users/daniel/default.nix +++ b/users/daniel/default.nix @@ -153,8 +153,8 @@ in { enable = true; settings = { gui.theme = { - selectedLineBgColor = [ "reverse" ]; - selectedRangeBgColor = [ "reverse" ]; + selectedLineBgColor = ["reverse"]; + selectedRangeBgColor = ["reverse"]; }; }; };