From 111106979813f71acbb95263384b732540c9c15f Mon Sep 17 00:00:00 2001 From: Andrey0189 Date: Fri, 7 Jun 2024 13:49:04 +0500 Subject: small changes --- flake.lock | 88 ++++++++++++++++++++++++++++++++++- flake.nix | 2 + home-manager/modules/wms/hyprland.nix | 2 +- nixos/configuration.nix | 4 +- nixos/packages.nix | 2 + 5 files changed, 95 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8d18527..dc704f9 100644 --- a/flake.lock +++ b/flake.lock @@ -52,6 +52,22 @@ "type": "github" } }, + "flake-compat_3": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -172,6 +188,22 @@ "type": "github" } }, + "libnbtplusplus": { + "flake": false, + "locked": { + "lastModified": 1650031308, + "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", + "owner": "PolyMC", + "repo": "libnbtplusplus", + "rev": "2203af7eeb48c45398139b583615134efd8d407f", + "type": "github" + }, + "original": { + "owner": "PolyMC", + "repo": "libnbtplusplus", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -225,6 +257,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1712129508, + "narHash": "sha256-FBVpEX0eLiqX3jnSL3rmJHqHhbuCikJZyDyV3Cl3qAY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d03a4482228d4d6dbd2d4b425b6dfcd49ebe765f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -251,6 +299,27 @@ "type": "github" } }, + "polymc": { + "inputs": { + "flake-compat": "flake-compat_3", + "libnbtplusplus": "libnbtplusplus", + "nixpkgs": "nixpkgs_2", + "tomlplusplus": "tomlplusplus" + }, + "locked": { + "lastModified": 1714685004, + "narHash": "sha256-ea/NfdZ9p7UlhUZhCz4LI1CZWLw4cjVN/lkaRjHrvYI=", + "owner": "PolyMC", + "repo": "PolyMC", + "rev": "62fd3d436a204232a5ae3bf9be6fde5fec819b81", + "type": "github" + }, + "original": { + "owner": "PolyMC", + "repo": "PolyMC", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -284,7 +353,8 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "polymc": "polymc" } }, "systems": { @@ -316,6 +386,22 @@ "repo": "default", "type": "github" } + }, + "tomlplusplus": { + "flake": false, + "locked": { + "lastModified": 1710824845, + "narHash": "sha256-A9XuCfVcLle/tMNaH7aqb1leM+t3wwC9ER5RIbMMovo=", + "owner": "marzer", + "repo": "tomlplusplus", + "rev": "1f7884e59165e517462f922e7b6de131bd9844f3", + "type": "github" + }, + "original": { + "owner": "marzer", + "repo": "tomlplusplus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 70c1df0..2d044f5 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + + polymc.url = "github:PolyMC/PolyMC"; }; outputs = { self, nixpkgs, nixpkgs-stable, home-manager, ... }@inputs: diff --git a/home-manager/modules/wms/hyprland.nix b/home-manager/modules/wms/hyprland.nix index f4b8acd..dd103b8 100644 --- a/home-manager/modules/wms/hyprland.nix +++ b/home-manager/modules/wms/hyprland.nix @@ -6,7 +6,7 @@ settings = { "$mainMod" = "SUPER"; - monitor = ",preferred,auto,1"; + monitor = ",1920x1080@90,auto,1"; env = [ "XDG_CURRENT_DESKTOP,Hyprland" diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b23d606..26070d5 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,4 +1,4 @@ -{ +{ inputs, ...}: { imports = [ ./hardware-configuration.nix ./packages.nix @@ -9,6 +9,8 @@ ./modules/xserver.nix ]; + nixpkgs.overlays = [ inputs.polymc.overlay ]; + networking.hostName = "nixos"; # Define your hostname. time.timeZone = "Asia/Tashkent"; # Set your time zone. diff --git a/nixos/packages.nix b/nixos/packages.nix index 7de68f1..6206c6c 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -6,6 +6,7 @@ environment.systemPackages = with pkgs; [ # Desktop apps + audacity chromium telegram-desktop alacritty @@ -19,6 +20,7 @@ obsidian zoom-us pcmanfm-qt + polymc # Coding stuff gnumake -- cgit v1.2.3