From 9ee8c9a527ce1bd0ad15706a4e1c07e4a036e135 Mon Sep 17 00:00:00 2001 From: jwy Date: Thu, 22 Aug 2024 00:20:27 -0400 Subject: [PATCH] Updated flake package versions (flake.lock) Due to an issue on unstable, had to disable 3 lsp servers in neovim config. (see https://github.com/NixOS/nixpkgs/pull/335559) Made various small changes to keep up w/ nix api changes --- flake.lock | 167 +++++++++++++-------------- nix-config/home/neovim.nix | 6 +- nix-config/hosts/nix-vm/hardware.nix | 1 + nix-config/system/displaymanager.nix | 15 +-- nix-config/system/opengl.nix | 5 +- nix-config/system/services.nix | 1 - 6 files changed, 96 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index f66581c3f..1a00af169 100644 --- a/flake.lock +++ b/flake.lock @@ -39,18 +39,17 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -68,11 +67,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1712808239, - "narHash": "sha256-YNg/wWQSz5nkkS3GoRy4P4tG2EQGc668ZyTiFOQ5Q2A=", + "lastModified": 1724212992, + "narHash": "sha256-MXxSlGiA/wIhts79vKUM1mRYk1BKW8amVx9D8ZUXAHY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "565f20f93ae68b11e2551da5446882e06392ed87", + "rev": "e4d175f6f71348b15f20dcd1ad15193149736412", "type": "gitlab" }, "original": { @@ -112,22 +111,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -157,11 +140,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -208,11 +191,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -221,21 +204,33 @@ "type": "github" } }, - "flake-utils_4": { + "git-hooks": { "inputs": { - "systems": "systems_3" + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", "type": "github" } }, @@ -265,16 +260,16 @@ "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -290,11 +285,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -312,11 +307,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -379,11 +374,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -394,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -444,19 +439,21 @@ "devshell": "devshell", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1712299511, - "narHash": "sha256-yrBK6Jq0UuJjP+nc01OFNoKRRJgPNkbmwPpE4mD2Bis=", + "lastModified": 1724222231, + "narHash": "sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU=", "owner": "nix-community", "repo": "nixvim", - "rev": "f285a958c089ccbca9c5710d4a075683fa1af654", + "rev": "b7f419a759f70126e220533b724cc17e8528b184", "type": "github" }, "original": { @@ -465,31 +462,25 @@ "type": "github" } }, - "pre-commit-hooks": { + "nuschtosSearch": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", - "gitignore": "gitignore_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "lastModified": 1723969429, + "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", + "owner": "NuschtOS", + "repo": "search", + "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "NuschtOS", + "repo": "search", "type": "github" } }, @@ -601,31 +592,37 @@ "type": "github" } }, - "systems_4": { + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/nix-config/home/neovim.nix b/nix-config/home/neovim.nix index f500b73f7..d3d2b018f 100644 --- a/nix-config/home/neovim.nix +++ b/nix-config/home/neovim.nix @@ -72,11 +72,11 @@ in { enable = true; servers = { bashls.enable = true; - cssls.enable = true; +# cssls.enable = true; docker-compose-language-service.enable = true; dockerls.enable = true; - html.enable = true; - jsonls.enable = true; +# html.enable = true; +# jsonls.enable = true; lua-ls.enable = true; marksman.enable = true; nil-ls.enable = true; diff --git a/nix-config/hosts/nix-vm/hardware.nix b/nix-config/hosts/nix-vm/hardware.nix index 4d30cbeb7..95e8edf06 100644 --- a/nix-config/hosts/nix-vm/hardware.nix +++ b/nix-config/hosts/nix-vm/hardware.nix @@ -19,6 +19,7 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/F318-54FD"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = diff --git a/nix-config/system/displaymanager.nix b/nix-config/system/displaymanager.nix index 2921250eb..c43f17c93 100644 --- a/nix-config/system/displaymanager.nix +++ b/nix-config/system/displaymanager.nix @@ -11,14 +11,15 @@ theKBDLayout theSecondKBDLayout; in layout = "${theKBDLayout}, ${theSecondKBDLayout}"; options = "ctrl:nocaps"; }; - libinput.enable = true; - displayManager.sddm = { - enable = true; - autoNumlock = true; - wayland.enable = true; - theme = "tokyo-night-sddm"; - }; }; + services.displayManager.sddm = { + enable = true; + autoNumlock = true; + wayland.enable = true; + theme = "tokyo-night-sddm"; + }; + services.libinput.enable = true; + # environment.variables = { # GDK_SCALE = "1.2"; # GDK_DPI_SCALE = "0.8"; diff --git a/nix-config/system/opengl.nix b/nix-config/system/opengl.nix index 513b698c8..02ae65474 100644 --- a/nix-config/system/opengl.nix +++ b/nix-config/system/opengl.nix @@ -2,9 +2,8 @@ { # OpenGL - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; } diff --git a/nix-config/system/services.nix b/nix-config/system/services.nix index 88a9c9ad1..7496d9909 100644 --- a/nix-config/system/services.nix +++ b/nix-config/system/services.nix @@ -22,7 +22,6 @@ jack.enable = true; }; hardware.pulseaudio.enable = false; - sound.enable = true; security.rtkit.enable = true; programs.thunar.enable = true; services.gvfs.enable = true;