From 0c31ed8e7073b97ea060e0fc01b976513604d617 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sat, 4 Oct 2025 13:35:56 +0200 Subject: [PATCH] attempt to make it faster, update --- .config/hypr/hyprland.conf | 1 + configuration.nix | 13 +- flake.lock | 228 ++++++++++++++++++++++++++++++-- flake.nix | 5 +- home.nix | 8 +- servers/eisen/configuration.nix | 7 +- sync-nix.sh | 3 +- 7 files changed, 247 insertions(+), 18 deletions(-) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index e10d021..320883c 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -117,6 +117,7 @@ env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = MOZ_ENABLE_WAYLAND,1 env = XDG_SESSION_DESKTOP,Hyprland env = XDG_CURRENT_DESKTOP,Hyprland +env = QT_ENABLE_FONTCONFIG_CACHE,1 #monitor=eDP-1,highrr,0x0,1.25 #monitor=eDP-2,highrr,0x0,1.25 diff --git a/configuration.nix b/configuration.nix index 026a353..a89ac48 100644 --- a/configuration.nix +++ b/configuration.nix @@ -75,7 +75,7 @@ in # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.nameservers = ["1.1.1.1"]; - services.dnsmasq.settings.server = [ "127.0.0.1#5053" ]; + services.dnsmasq.settings.server = [ "100.100.100.100" "127.0.0.1#5053" ]; networking.networkmanager.enable = true; networking.networkmanager.plugins = with pkgs; [networkmanager-openconnect]; @@ -165,6 +165,15 @@ in programs.partition-manager.enable = true; time.hardwareClockInLocalTime = true; + fonts.fontDir.enable = true; + fonts.enableDefaultPackages = false; + + fonts.packages = with pkgs; [ + noto-fonts + liberation_ttf + noto-fonts-color-emoji + ]; + users.users.dan = { isNormalUser = true; description = "John"; @@ -187,11 +196,13 @@ in "https://hyprland.cachix.org" "https://nix-gaming.cachix.org" "https://colmena.cachix.org" + "https://install.determinate.systems" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM=" ]; }; diff --git a/flake.lock b/flake.lock index c4d8cd1..24f2e58 100644 --- a/flake.lock +++ b/flake.lock @@ -78,9 +78,70 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-darwin": [ + "determinate", + "determinate-nixd-aarch64-darwin" + ], + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1757699119, + "narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=", + "rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e", + "revCount": 304, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.2/01993f0b-1215-7072-ac1a-f2b27b566115/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + } + }, "dolphin-overlay": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1743892246, @@ -113,6 +174,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -129,6 +206,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "revCount": 377, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -176,6 +274,32 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": [ + "determinate", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "revCount": 1026, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -314,7 +438,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" @@ -547,10 +671,31 @@ "type": "github" } }, - "nix-gaming": { + "nix": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1757694985, + "narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=", + "rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24", + "revCount": 22340, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + } + }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1759110900, @@ -638,6 +783,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1754788789, @@ -653,6 +814,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1758690382, @@ -685,6 +862,34 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "revCount": 808723, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "revCount": 856744, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.856744%2Brev-ca77296380960cd497a765102eeb1356eb80fed0/01992cf9-9347-761a-8963-9cbe43abe2fa/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1743890059, "narHash": "sha256-QQLhHHGNtAW8qRpseb40zqZlhZUeRRUg2SGmXjfE+so=", @@ -699,7 +904,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1758198701, "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", @@ -715,7 +920,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1758976413, "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", @@ -731,7 +936,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1758690382, "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", @@ -747,7 +952,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1755615617, "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", @@ -765,7 +970,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "hyprland-plugins", @@ -791,13 +996,14 @@ "inputs": { "colmena": "colmena", "copyparty": "copyparty", + "determinate": "determinate", "dolphin-overlay": "dolphin-overlay", "home-manager": "home-manager", "hyprland-plugins": "hyprland-plugins", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "zen-browser": "zen-browser" } @@ -883,7 +1089,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1759072580, diff --git a/flake.nix b/flake.nix index f5d2032..444a4d2 100644 --- a/flake.nix +++ b/flake.nix @@ -26,12 +26,14 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; + colmena.url = "github:zhaofengli/colmena"; copyparty.url = "github:9001/copyparty"; }; - outputs = { nixpkgs, colmena, zen-browser, dolphin-overlay, hyprland-plugins, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: { + outputs = { nixpkgs, determinate, colmena, zen-browser, dolphin-overlay, hyprland-plugins, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: { nixosConfigurations.lenovo-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -53,6 +55,7 @@ }) ]; } + determinate.nixosModules.default home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home.nix b/home.nix index 4e0f9c3..41fae7c 100644 --- a/home.nix +++ b/home.nix @@ -18,9 +18,13 @@ in stateVersion = "24.05"; packages = with pkgs; [ + linuxKernel.packages.linux_6_12.perf + obs-studio + flamegraph + samply font-awesome - arduino-ide - xorg.libxkbfile + arduino-ide + xorg.libxkbfile # dioxus-cli cosmic-files diff --git a/servers/eisen/configuration.nix b/servers/eisen/configuration.nix index af9e4cd..02a2482 100644 --- a/servers/eisen/configuration.nix +++ b/servers/eisen/configuration.nix @@ -1,5 +1,5 @@ -{ config, pkgs, lib, name ? "eisen", copyparty, ... }: +{ config, nix-index-database, pkgs, lib, name ? "eisen", copyparty, ... }: let # these are used both in service configuration but also to # create mappings {name}.eisen.danbulant.cloud to port in caddy @@ -22,7 +22,10 @@ in nixpkgs.overlays = [ copyparty.overlays.default ]; + programs.nix-index-database.comma.enable = true; + imports = [ + nix-index-database.nixosModules.nix-index copyparty.nixosModules.default ./hardware-configuration.nix ]; @@ -301,4 +304,4 @@ in # /etc/hosts :) networking.extraHosts = '' ''; -} \ No newline at end of file +} diff --git a/sync-nix.sh b/sync-nix.sh index e9c8e3f..6c759ec 100755 --- a/sync-nix.sh +++ b/sync-nix.sh @@ -7,5 +7,6 @@ if [ -z "$(which nh)" ]; then else # sudo nix-channel --update # sudo nix flake update - nh os switch . -- --show-trace + nh os switch . -- --show-trace --option extra-substituters https://install.determinate.systems --option extra-trusted-public-keys cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM= + fi