diff --git a/flake.lock b/flake.lock index 7a13626..35faed8 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "type": "github" }, "original": { @@ -35,14 +35,15 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "utils": "utils" }, "locked": { - "lastModified": 1653153149, - "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=", + "lastModified": 1658750091, + "narHash": "sha256-T7wmpoE5UJPuX8VQCpZIG7O8foAC3BCr+DK+GnXA4uM=", "owner": "nix-community", "repo": "home-manager", - "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8", + "rev": "8419dfd39d678afd5bc40df48f21fcaad8fc1332", "type": "github" }, "original": { @@ -69,25 +70,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653117584, - "narHash": "sha256-5uUrHeHBIaySBTrRExcCoW8fBBYVSDjDYDU5A6iOl+k=", - "owner": "NixOS", + "lastModified": 1654953433, + "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "f4dfed73ee886b115a99e5b85fdfbeb683290d83", + "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1653060744, - "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=", + "lastModified": 1658648081, + "narHash": "sha256-RL5nr4Xhp0zQeEGG/I3t3FmqaI9QrBg5PH31NF+7A/A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfd82985c273aac6eced03625f454b334daae2e8", + "rev": "e494a908e8895b9cba18e21d5fc83362f64b3f6a", "type": "github" }, "original": { @@ -99,11 +102,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1637453606, - "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=", + "lastModified": 1656401090, + "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8afc4e543663ca0a6a4f496262cd05233737e732", + "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb", "type": "github" }, "original": { @@ -119,11 +122,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1653273659, - "narHash": "sha256-dHXYaNL1axhZZyiZXxt1WKhvZrYXq7bjCs3y5VjgyGI=", + "lastModified": 1658717414, + "narHash": "sha256-M5piRQdqU680bWhkpyQH09zub75VxfRtuQmNJc+1mhc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0fa3e01da1ce98e3b40063b8e2678095943402b1", + "rev": "f612ccd516e97a14e4a7b55c6c88826f575e6805", "type": "github" }, "original": { @@ -139,6 +142,21 @@ "nixpkgs": "nixpkgs_3", "oxalica": "oxalica" } + }, + "utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix index 16f3745..4e06d57 100644 --- a/machines/thor/configuration.nix +++ b/machines/thor/configuration.nix @@ -41,6 +41,7 @@ canTouchEfiVariables = true; }; }; + home-manager.users.riley.home.stateVersion = "21.11"; users.users."riley".packages = with pkgs; [ minecraft diff --git a/modules/kak/colors.nix b/modules/kak/colors.nix index 5296eb3..9265009 100644 --- a/modules/kak/colors.nix +++ b/modules/kak/colors.nix @@ -7,9 +7,9 @@ pkgs.writeTextFile (rec { face global comment rgb:828282 - face global value rgb:${blue.normal} + face global value rgb:${green.normal} face global string rgb:${green.normal} - face global keyword rgb:${cyan.normal} + face global keyword rgb:${misc.blueGrey} face global operator rgb:${cyan.normal} face global function rgb:${cyan.normal} face global builtin rgb:${orange.normal} diff --git a/modules/kak/kakrc.nix b/modules/kak/kakrc.nix index f3117c0..bf11fae 100644 --- a/modules/kak/kakrc.nix +++ b/modules/kak/kakrc.nix @@ -78,6 +78,7 @@ let keybinds = '' let nix-config = (lib.optionalString nix '' hook global WinSetOption filetype=nix %{ ${ide-init} + face global keyword rgb:${theme.cyan.normal} } ''); @@ -153,17 +154,19 @@ let nix-config = (lib.optionalString nix '' hook global NormalIdle .* %{ lsp-highlight-references } hook global InsertMove .* %{ lsp-highlight-references } - face global meta white - face global type rgb:${theme.blue.bright} - face global trait rgb:${theme.pink.normal} + face global type rgb:${theme.blue.normal} + face global trait rgb:${theme.purple.normal} face global macro rgb:${theme.green.bright} - face global format rgb:${theme.green.bright} + face global format rgb:${theme.orange.bright} face global attribute rgb:${theme.orange.bright} face global operator rgb:${theme.yellow.normal} - face global keyword rgb:${theme.purple.pastel} face global function rgb:${theme.green.bright} face global keyword rgb:${theme.misc.blueGrey} + face global variable white + face global value white + face global meta white + face global alias rgb:${theme.orange.normal} face global enum type face global struct type diff --git a/overlays/default.nix b/overlays/default.nix index 0d1e61b..9c07493 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1 +1,11 @@ -self: super: {} +self: super: { + minecraft = + let version = "2.2.2012"; + in super.minecraft.overrideAttrs (old: { + inherit version; + src = self.fetchurl { + url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; + sha256 = "sha256-er+g/0pqsS5mDcZ5ID9kATuF3RwDQThue1mc/XRVms8="; + }; + }); +}