From 0a1a056fd568c5c11a745c7090d2cc5f5990704a Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 29 Sep 2023 01:47:31 +0200 Subject: [PATCH] lots --- configuration.nix | 24 +++++++--- flake.lock | 114 +++++++++++++++++++++++++++++++++++++++++++--- sync.sh | 4 +- 3 files changed, 128 insertions(+), 14 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8b24c33..aa6131a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,19 +8,20 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./hostname.nix ]; nixpkgs.config.permittedInsecurePackages = [ "python-2.7.18.6" # "electron-16.2.3" ]; + + networking.hostName = "queer-utopia"; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.systemd-boot.configurationLimit = 42; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; + #boot.loader.systemd-boot.configurationLimit = 42; + #boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.kernelPackages = pkgs.linuxPackages_latest; environment.sessionVariables = { @@ -31,7 +32,7 @@ xdg.portal = { enable = true; }; - + services.udev.enable = true; services.udev.packages = [pkgs.arduino]; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -245,19 +246,30 @@ godot nodejs python310 - python310Packages.adblock + mold #cope arduino # rust rustup llvmPackages_rocm.clang llvmPackages_rocm.llvm + llvmPackages.bintools libclang #language servers rust-analyzer lldb #not a langage server but w/e nodePackages.vscode-langservers-extracted unstable.typst-lsp + #vscodium + extensions + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; [ + rust-lang.rust-analyzer + dracula-theme.theme-dracula + arrterian.nix-env-selector + bungcip.better-toml + ]; + }) # creative gimp @@ -402,6 +414,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.05"; # Did you read the comment? +# system.stateVersion = "22.05"; # Did you read the comment? } diff --git a/flake.lock b/flake.lock index a8eb675..ff5898b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,39 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "kaokao": { "inputs": { "nixpkgs": "nixpkgs" @@ -34,18 +68,33 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1679224734, - "narHash": "sha256-1Ab3xY7Wgo1h1TNwRt6fp2XjV+KUo+hP1Bolh0KiDJs=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eac7da7b519a5aefe92c33c90b4450a24ebe0ab3", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1695416179, + "narHash": "sha256-610o1+pwbSu+QuF3GE0NU5xQdTHM3t9wyYhB9l94Cd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "715d72e967ec1dd5ecc71290ee072bcaf5181ed6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", "type": "indirect" } }, @@ -65,11 +114,29 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1695318763, + "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "kaokao": "kaokao", "nixpkgs": "nixpkgs_2", - "supercolor": "supercolor" + "nixpkgs-unstable": "nixpkgs-unstable", + "supercolor": "supercolor", + "tree-sitter-typst": "tree-sitter-typst" } }, "supercolor": { @@ -89,6 +156,41 @@ "repo": "supercolor", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tree-sitter-typst": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1680673700, + "narHash": "sha256-CP5FD3jh4PO2g8p2v4DaCu7fE6/fnI3T56MQhdAcdTc=", + "owner": "SeniorMars", + "repo": "tree-sitter-typst", + "rev": "2e66ef4b798a26f0b82144143711f3f7a9e8ea35", + "type": "github" + }, + "original": { + "owner": "SeniorMars", + "repo": "tree-sitter-typst", + "type": "github" + } } }, "root": "root", diff --git a/sync.sh b/sync.sh index fa25406..f2621e3 100755 --- a/sync.sh +++ b/sync.sh @@ -10,6 +10,6 @@ sudo cp -r ./configuration.nix ./flake.nix /etc/nixos/ cd /etc/nixos/ -sudo nix flake update +sudo nix flake update --extra-experimental-features nix-command --extra-experimental-features flakes -sudo nixos-rebuild switch --upgrade --impure +sudo nixos-rebuild switch --upgrade --impure --flake .#queer-utopia