From 3c31e70fd27422be8e453c77cc26e3fa93f81967 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Thu, 2 Jan 2025 09:35:55 +0100 Subject: [PATCH] Config changes --- flake.lock | 48 +++++++++---------- flake.nix | 1 - hosts/desktop/home.nix | 4 +- modules/system/default.nix | 2 +- .../system/desktop-environments/cosmic.nix | 6 ++- modules/system/hardware/nvidia.nix | 2 +- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 89240f5..412e0bc 100644 --- a/flake.lock +++ b/flake.lock @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1735263434, - "narHash": "sha256-5Bn1c2sWzedpGV+PNfXtoainQ3uUKkx/v7T3N6lKKms=", + "lastModified": 1735695461, + "narHash": "sha256-xWeCORE1NA95dt3m1wGTmWFao8uMtmysK26jVcsL1tI=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e5fdfe023742172ec0e7af0ca6d88362228d14b7", + "rev": "80d9501f798baa8d55d86398142bc94db7619d8e", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -299,11 +299,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1735141468, - "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1735180071, - "narHash": "sha256-ceUDFBsLf5Cz3GlhQAdaJsEfi5s1MDjDsO9VvPFoKAE=", + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "550e1f10be4a504747a7894c35e887e61235763b", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1735253599, - "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", + "lastModified": 1735664732, + "narHash": "sha256-KoXLDDDT/nMBMl6VtoAGxJ58COvT+SWL5aiR+hUPBUo=", "owner": "danth", "repo": "stylix", - "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", + "rev": "f48cab39ba162c5eaef3d975aaac467c20db402b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ec9408..218ca2e 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,6 @@ ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) inputs.nixos-hardware.nixosModules.framework-13-7040-amd - nixos-cosmic.nixosModules.default ./hosts/laptop ]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 70f1c90..f77be89 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,9 +6,6 @@ ../../modules/home/default.nix ]; - # Enable home-manager - programs.home-manager.enable = true; - options = { host = lib.mkOption { type = with lib.types; str; @@ -37,6 +34,7 @@ home.packages = with pkgs; [ unstable.prismlauncher unstable.vesktop + unstable.baobab ]; # Enable home-manager diff --git a/modules/system/default.nix b/modules/system/default.nix index 170268f..c13c57d 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -14,7 +14,7 @@ ./hardware/bluetooth.nix ./hardware/fprint.nix ./hardware/locale.nix - # ./hardware/nvidia.nix + ./hardware/nvidia.nix ./hardware/firewall.nix ./hardware/printing.nix diff --git a/modules/system/desktop-environments/cosmic.nix b/modules/system/desktop-environments/cosmic.nix index 4ccd6ee..2e2871e 100644 --- a/modules/system/desktop-environments/cosmic.nix +++ b/modules/system/desktop-environments/cosmic.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, config, inputs, ... }: with lib; @@ -14,6 +14,10 @@ in { }; }; + imports = [ + inputs.nixos-cosmic.nixosModules.default + ]; + config = mkIf cfg.enable { services.desktopManager.cosmic.enable = true; diff --git a/modules/system/hardware/nvidia.nix b/modules/system/hardware/nvidia.nix index eb1004c..7ee1008 100644 --- a/modules/system/hardware/nvidia.nix +++ b/modules/system/hardware/nvidia.nix @@ -6,7 +6,7 @@ let cfg = config.settings.hardware.nvidia; in { options = { - settings.hardware.firewall.enable = lib.mkOption { + settings.hardware.nvidia.enable = lib.mkOption { type = lib.types.bool; description = '' Enable nvidia drivers