diff --git a/flake.lock b/flake.lock index 34fa434..5ff7dad 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "type": "github" }, "original": { @@ -29,11 +28,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720602715, - "narHash": "sha256-fjFdTtP0K94y6lsmUukyLh2VMqDme//+goDsTal+CrU=", + "lastModified": 1724119075, + "narHash": "sha256-rZe4WgHhLqhu4NjGVYyIQ36ieHZgSkfnNMdLzKaqFQk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "77ddb4021ae40a3a6aac74d7730f36cdb3dde4ba", + "rev": "e197771f35c8c330324256c5f306614f273ffd9d", "type": "github" }, "original": { @@ -80,11 +79,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -111,32 +110,14 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flameshot-git": { "flake": false, "locked": { - "lastModified": 1718732606, - "narHash": "sha256-Y9RnVxic5mlRIc48wYVQXrvu/s65smtMMVj8HBskHzE=", + "lastModified": 1722597081, + "narHash": "sha256-WXUxrirlevqJ+dnXZbN1C1l5ibuSI/DBi5fqPx9nOGQ=", "owner": "flameshot-org", "repo": "flameshot", - "rev": "c1dac52231024174faa68a29577129ebca125dff", + "rev": "fd3772e2abb0b852573fcaa549ba13517f13555c", "type": "github" }, "original": { @@ -159,11 +140,11 @@ ] }, "locked": { - "lastModified": 1720450253, - "narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -201,11 +182,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -245,11 +226,11 @@ ] }, "locked": { - "lastModified": 1720337362, - "narHash": "sha256-9TNQtlwu97NPaJYsKkdObOsy0MLN4NAOBz0pqwH3KnA=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0f89b73f41eaa1dde67b291452c181d9a75f10dd", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -260,11 +241,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -276,11 +257,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { @@ -292,11 +273,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720418205, - "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "655a58a72a6601292512670343087c2d75d859c1", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -308,11 +289,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { @@ -336,11 +317,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1720472744, - "narHash": "sha256-BJf06/uE8XgjSqXB6ftabinqK+qaAmWA0dLxAfLrAjw=", + "lastModified": 1723897703, + "narHash": "sha256-0lMrm2pzAz9V+3e8opIgpBnqJu3wp7BLRGLH5L+LiD4=", "owner": "nix-community", "repo": "nixvim", - "rev": "2c52164a4f1b863f5eda842b4b9423b7f2677ddc", + "rev": "3187749816b3549cf46c5ca85e6736d0ed4a5aa0", "type": "github" }, "original": { @@ -377,21 +358,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -400,11 +366,11 @@ ] }, "locked": { - "lastModified": 1720436211, - "narHash": "sha256-/cKXod0oGLl+vH4bKBZnTV3qxrw4jgOLnyQ8KXey5J8=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6fc8bded78715cdd43a3278a14ded226eb3a239e", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { @@ -416,11 +382,11 @@ "vim-org-roam": { "flake": false, "locked": { - "lastModified": 1719134875, - "narHash": "sha256-7s7nePlg/lF/JplR3qvY+ZT1B/wUG6TymCis4OMBBQ8=", + "lastModified": 1722861368, + "narHash": "sha256-ZSjNUg+uvSu26SLdMZmXxV/d1ojPblXBIWkQ3LEp+WM=", "owner": "chipsenkbeil", "repo": "org-roam.nvim", - "rev": "45153562e7bfe806d84747d6518cad714c63ca2e", + "rev": "192732a8de167e7770b12db31e737239311b1a43", "type": "github" }, "original": { diff --git a/hosts/nixos-desktop/hardware-configuration.nix b/hosts/nixos-desktop/hardware-configuration.nix index a736fa3..ae91db7 100644 --- a/hosts/nixos-desktop/hardware-configuration.nix +++ b/hosts/nixos-desktop/hardware-configuration.nix @@ -1,11 +1,23 @@ -{ config, lib, pkgs, modulesPath, ... }: { +{ + config, + lib, + pkgs, + modulesPath, + ... +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { - initrd.availableKernelModules = - [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; + initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "sd_mod" + ]; initrd.kernelModules = [ "amdgpu" ]; - kernelPackages = pkgs.linuxPackages_6_9; + # kernelPackages = pkgs.linuxPackages_6_9; # Prevents constant crashing in BG3 kernelParams = [ diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index ad76c61..f3110dd 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -157,7 +157,6 @@ in mullvad-browser keepassxc krita - element-desktop swayimg mpv mumble diff --git a/modules/desktop/wm.nix b/modules/desktop/wm.nix index f0f5fa4..a606711 100644 --- a/modules/desktop/wm.nix +++ b/modules/desktop/wm.nix @@ -117,7 +117,7 @@ in wayland.windowManager.hyprland = { enable = true; - package = pkgs.unstable.hyprland; + # package = pkgs.unstable.hyprland; systemd.enable = true; xwayland.enable = true; settings = { @@ -148,6 +148,11 @@ in preserve_split = true; }; + debug = { + disable_logs = false; + enable_stdout_logs = true; + }; + input = { kb_layout = "fr"; kb_options = "caps:escape";