From 1121272da311db83352d19a521b22bece8d69cdb Mon Sep 17 00:00:00 2001 From: Vivian Date: Thu, 12 Sep 2024 10:26:45 +0200 Subject: [PATCH] fix warnings --- common/hm-modules/nvim/default.nix | 7 +- common/modules/gnome/default.nix | 18 ++-- flake.lock | 148 +++++++++++------------------ hosts/olympus/eevee/hardware.nix | 2 +- 4 files changed, 70 insertions(+), 105 deletions(-) diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix index 8f86bdc7..0f815f13 100644 --- a/common/hm-modules/nvim/default.nix +++ b/common/hm-modules/nvim/default.nix @@ -215,8 +215,10 @@ with lib; enable = true; settings = { new_notes_location = "notes_subdir"; + disable_frontmatter = true; + notes_subdir = "Unsorted"; daily_notes = { - folder = "daily"; + folder = "Daily"; }; workspaces = [ { @@ -274,7 +276,6 @@ with lib; treesitter = { enable = true; nixGrammars = true; - disabledLanguages = [ "latex" ]; }; # surround.enable = true; fugitive.enable = true; @@ -282,7 +283,7 @@ with lib; lualine = { enable = true; - theme = "catppuccin"; + settings.options.theme = "catppuccin"; }; telescope = { diff --git a/common/modules/gnome/default.nix b/common/modules/gnome/default.nix index 27902f6e..0c3fbcb9 100644 --- a/common/modules/gnome/default.nix +++ b/common/modules/gnome/default.nix @@ -46,7 +46,7 @@ in displayManager.gdm.enable = lib.mkDefault true; desktopManager.gnome.enable = true; }; - udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + udev.packages = with pkgs; [ gnome-settings-daemon ]; dbus.enable = true; udisks2.enable = true; }; @@ -66,19 +66,17 @@ in simple-scan # document scanner totem # video player gnome-terminal - ]) - ++ (with pkgs.gnome; [ - atomix # puzzle game - pkgs.gedit # text editor - gnome-clocks gnome-contacts + atomix # puzzle game gnome-maps + gedit # text editor gnome-music - gnome-notes - gnome-weather - hitori # sudoku game + gnome-clocks iagno # go game tali # poker game + hitori # sudoku game + gnome-notes + gnome-weather ]); # Services required for gnome @@ -87,7 +85,7 @@ in # Extra gnome packages environment.systemPackages = with pkgs; [ gnome-tweaks - gnome.gnome-boxes + gnome-boxes ]; }; } diff --git a/flake.lock b/flake.lock index 9d026692..f0f1831c 100644 --- a/flake.lock +++ b/flake.lock @@ -5,18 +5,17 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1725300620, - "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", + "lastModified": 1725815284, + "narHash": "sha256-nVWCR86XDjx9Tq6RHsNvhD03nNzIeKKc7UTPnXLyrDY=", "owner": "zhaofengli", "repo": "attic", - "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", + "rev": "aec90814a4ecbc40171d57eeef97c5cab4aaa7b4", "type": "github" }, "original": { @@ -59,7 +58,7 @@ "colmena": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "stable": "stable" }, @@ -162,7 +161,7 @@ }, "essentials": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -355,15 +354,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -374,7 +370,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1714763823, @@ -391,23 +387,8 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -423,9 +404,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -441,6 +422,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_5": { "inputs": { "systems": "systems_5" @@ -499,24 +498,6 @@ "inputs": { "systems": "systems_8" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "inputs": { - "systems": "systems_9" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -607,7 +588,7 @@ }, "gnome-autounlock-keyring": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -633,11 +614,11 @@ ] }, "locked": { - "lastModified": 1725628988, - "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", + "lastModified": 1726036828, + "narHash": "sha256-ZQHbpyti0jcAKnwQY1lwmooecLmSG6wX1JakQ/eZNeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", + "rev": "8a1671642826633586d12ac3158e463c7a50a112", "type": "github" }, "original": { @@ -717,7 +698,7 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_3", "spectrum": "spectrum" }, @@ -758,11 +739,11 @@ }, "nixlib": { "locked": { - "lastModified": 1725152544, - "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", + "lastModified": 1725757153, + "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", + "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", "type": "github" }, "original": { @@ -779,11 +760,11 @@ ] }, "locked": { - "lastModified": 1725497951, - "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", + "lastModified": 1725843519, + "narHash": "sha256-Z6DglUwgFDz6fIvQ89wx/uBVWrGvEGECq0Ypyk/eigE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", + "rev": "214efbd73241d72a8f48b8b9a73bb54895cd51a7", "type": "github" }, "original": { @@ -794,11 +775,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "type": "github" }, "original": { @@ -904,11 +885,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -962,11 +943,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725669404, - "narHash": "sha256-Bbp1GVgKVLz9mSfzgwBdQ96Pxm+RgPEdYjS4kKSFrAI=", + "lastModified": 1726000537, + "narHash": "sha256-Y1dEuf2wZkg2rhE8sf73x9K0zknUald4Ia6zXnGEfjg=", "owner": "pta2002", "repo": "nixvim", - "rev": "86a4021597c860a6cd1953305a9995f44e60d4d5", + "rev": "fc7e9b29271a03459191955f78d4128451b7cd81", "type": "github" }, "original": { @@ -977,11 +958,11 @@ }, "nur": { "locked": { - "lastModified": 1725687722, - "narHash": "sha256-LPv282y5okYk8ebiBsEbDXy2WykwdBPpAthjKSmTfNI=", + "lastModified": 1726036733, + "narHash": "sha256-2HtGkO408Gkvg/M+9s1jcDqt2+u7MzjzZPlxpBORfOQ=", "owner": "nix-community", "repo": "NUR", - "rev": "ff7f8143f33751c4f37caec678ed1eb63006c0d3", + "rev": "76210ff4db87bac735c6a18e3443852563469704", "type": "github" }, "original": { @@ -992,7 +973,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixvim", "nixpkgs" @@ -1235,24 +1216,9 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "t": { "inputs": { - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] @@ -1294,7 +1260,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1701680307, @@ -1331,7 +1297,7 @@ }, "vault-unseal": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] diff --git a/hosts/olympus/eevee/hardware.nix b/hosts/olympus/eevee/hardware.nix index 1595ddfb..a7947306 100644 --- a/hosts/olympus/eevee/hardware.nix +++ b/hosts/olympus/eevee/hardware.nix @@ -6,7 +6,7 @@ # package = config.boot.kernelPackages.nvidiaPackages.stable; # Open drivers cause gdm to crash - # open = true; + open = false; # nvidia-drm.modeset=1 modesetting.enable = true;