From fcb518e6194a8d9885304fd6f0f08b09823fc0c7 Mon Sep 17 00:00:00 2001 From: noe Date: Thu, 25 Jan 2024 20:51:11 -0500 Subject: [PATCH] sync: --- flake.lock | 173 +++++++++++--------------- home-manager/features/vim.nix | 26 ++-- home-manager/noe/common/home-user.nix | 2 - nixos/client.nix | 1 - nixos/features/nvidia.nix | 4 +- nixos/hosts/aerial/default.nix | 2 +- 6 files changed, 86 insertions(+), 122 deletions(-) diff --git a/flake.lock b/flake.lock index 8dc9512..86d3042 100644 --- a/flake.lock +++ b/flake.lock @@ -25,16 +25,17 @@ "crane": "crane", "fenix": "fenix", "flake-utils": "flake-utils", + "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1705514181, - "narHash": "sha256-Y9qOM42lqfvVdg9VZ7lH6VXRcuAkH0T/FbgX+hW/1IQ=", + "lastModified": 1706138640, + "narHash": "sha256-HjPCE+b/RpBhKvfeDnWfvgTW74SIrj9iKdMEIKDS1Fo=", "owner": "famedly", "repo": "conduit", - "rev": "247599510290163181b8884fc2418d9e86e584c8", + "rev": "ca198c51fad2cccf572a1aae380dfd0e591b9937", "type": "gitlab" }, "original": { @@ -45,23 +46,17 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "conduit", - "flake-utils" - ], "nixpkgs": [ "conduit", "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1705597458, + "narHash": "sha256-vJ8Ib9ruxbaBxGEcA0d7dHqxpc6Z+SGR2XIxVeSMuLM=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "742170d82cd65c925dcddc5c3d6185699fbbad08", "type": "github" }, "original": { @@ -99,11 +94,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1689488573, - "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=", + "lastModified": 1705559032, + "narHash": "sha256-Cb+Jd1+Gz4Wi+8elPnUIHnqQmE1qjDRZ+PsJaPaAffY=", "owner": "nix-community", "repo": "fenix", - "rev": "39096fe3f379036ff4a5fa198950b8e79defe939", + "rev": "e132ea0eb0c799a2109a91688e499d7bf4962801", "type": "github" }, "original": { @@ -130,11 +125,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -159,22 +154,6 @@ "type": "github" } }, - "flake-compat_4": { - "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": [ @@ -201,11 +180,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -237,11 +216,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -281,11 +260,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -301,11 +280,11 @@ ] }, "locked": { - "lastModified": 1705879479, - "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", + "lastModified": 1706134977, + "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", + "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10", "type": "github" }, "original": { @@ -342,11 +321,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1705911882, - "narHash": "sha256-S5wqI5xX3nRSJi1ZrR4x+bA7mzuMRMOnoUNXGIvExeI=", + "lastModified": 1706078134, + "narHash": "sha256-l6ZkbXi4Tv2S2HOJhLjL7iCrSy5cAMLbEp0hR5IiIBg=", "owner": "nix-community", "repo": "kde2nix", - "rev": "79e792034cffa8b697b6c1a4a9d7310736822fc8", + "rev": "22331df82eec03417bc083371793c618e2a6eb52", "type": "github" }, "original": { @@ -376,6 +355,21 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1693701915, @@ -397,11 +391,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1705931262, - "narHash": "sha256-JU8Dn3FeLlpC2aCXDbVH+E9koZYw/r1LW+fofWq87mE=", + "lastModified": 1706085261, + "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "ed8ab00e8d92076a7cac1b428881b4d5304bb771", + "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", "type": "github" }, "original": { @@ -444,11 +438,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1705774713, - "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", + "lastModified": 1705916986, + "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", + "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", "type": "github" }, "original": { @@ -492,16 +486,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705911640, - "narHash": "sha256-auO4spQ1+4HA8NtpAcrRkKz6I9t/Yk5GBeZgQ5/6pYI=", - "owner": "K900", + "lastModified": 1705936081, + "narHash": "sha256-koT6JZMFkA/EDZLSdkTa2LgEjM+JLKWWZyyARbh2yLE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "df8dfca854b41c3addcdb0f0f481c203d9728e3c", + "rev": "f048098f0b0945a9054e11ae5dba08b5688b0be1", "type": "github" }, "original": { - "owner": "K900", - "ref": "kdsoap-fix", + "owner": "NixOS", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -565,11 +559,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1705961248, - "narHash": "sha256-sqK417zKqVoxallioKRtHMSssOJT6gEpQ9FIuBKIoG0=", + "lastModified": 1706111147, + "narHash": "sha256-4VtYk79oJExuHxwN/5NIzLBzq4VVcfbnXawJMUIXrrc=", "owner": "nix-community", "repo": "nixvim", - "rev": "01c21406c6f4f6c137f861f9503572c5d0c9d98b", + "rev": "ddce82d0d1fb88c957ecb7debed2ae6c63b60750", "type": "github" }, "original": { @@ -580,7 +574,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": [ "kde2nix", "flake-utils" @@ -608,7 +602,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", "nixpkgs": [ @@ -621,11 +615,11 @@ ] }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1705757126, + "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", "type": "github" }, "original": { @@ -652,11 +646,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1689441253, - "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=", + "lastModified": 1705523001, + "narHash": "sha256-TWq5vJ6m+9HGSDMsQAmz1TMegMi79R3TTyKjnPWsQp8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8", + "rev": "9d9b34354d2f13e33568c9c55b226dd014a146a0", "type": "github" }, "original": { @@ -682,44 +676,17 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "conduit", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "conduit", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688351637, - "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1705805983, - "narHash": "sha256-HluB9w7l75I4kK25uO4y6baY4fcDm2Rho0WI1DN2Hmc=", + "lastModified": 1706130372, + "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ae171b54e76ced88d506245249609f8c87305752", + "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68", "type": "github" }, "original": { diff --git a/home-manager/features/vim.nix b/home-manager/features/vim.nix index 67aa6cb..8fe1f1e 100644 --- a/home-manager/features/vim.nix +++ b/home-manager/features/vim.nix @@ -38,7 +38,7 @@ }; lightline.enable = true; toggleterm.enable = true; - #rainbow-delimiters.enable = true; + rainbow-delimiters.enable = true; treesitter.enable = true; barbar.enable = true; gitgutter.enable = true; @@ -49,18 +49,18 @@ luasnip.enable = true; - #lsp = { - # enable = true; - # servers = { - # nil_ls.enable = true; - # rust-analyzer.enable = true; - # rust-analyzer.installRustc = false; # use rustc in nix shells, maybe? - # rust-analyzer.installCargo = false; - # tsserver.enable = true; - # htmx.enable = true; - # html.enable = true; - # }; - #}; + lsp = { + enable = true; + servers = { + nil_ls.enable = true; + rust-analyzer.enable = true; + rust-analyzer.installRustc = false; # use rustc in nix shells, maybe? + rust-analyzer.installCargo = false; + tsserver.enable = true; + htmx.enable = true; + html.enable = true; + }; + }; }; extraPlugins = with pkgs.vimPlugins; [ diff --git a/home-manager/noe/common/home-user.nix b/home-manager/noe/common/home-user.nix index b75bc34..d726a2a 100644 --- a/home-manager/noe/common/home-user.nix +++ b/home-manager/noe/common/home-user.nix @@ -9,7 +9,6 @@ in ]; programs.nheko.enable = true; - #services.gnome-keyring.enable = true; home = { inherit homeDirectory; @@ -18,7 +17,6 @@ in packages = with pkgs; [ profanity gomuks - ]; }; } diff --git a/nixos/client.nix b/nixos/client.nix index 6a5c70b..b51fe8a 100644 --- a/nixos/client.nix +++ b/nixos/client.nix @@ -16,6 +16,5 @@ htop neofetch xclip - keepassxc ]; } diff --git a/nixos/features/nvidia.nix b/nixos/features/nvidia.nix index d534e07..3010b97 100644 --- a/nixos/features/nvidia.nix +++ b/nixos/features/nvidia.nix @@ -17,13 +17,13 @@ hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = false; + powerManagement.enable = true; powerManagement.finegrained = false; open = false; nvidiaSettings = true; - package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.stable; + package = lib.mkDefault config.boot.kernelPackages.nvidiaPackages.beta; }; } diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix index 3d55d35..aac716c 100644 --- a/nixos/hosts/aerial/default.nix +++ b/nixos/hosts/aerial/default.nix @@ -3,7 +3,7 @@ ./hardware-configuration.nix ../../client.nix - ../../features/xfce.nix + ../../features/plasma5.nix ../../features/tailscale.nix ../../features/sound ../../features/nvidia.nix