From 83d1b8255d97eaf82b5e9e1f9e5b39119ac763b7 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:55:44 +0400 Subject: [PATCH] (dangerous) switch to unstable --- flake.lock | 27 +++++++++---------- flake.nix | 4 +-- modules/desktop/apps/nemo/default.nix | 2 +- modules/desktop/apps/transmission/default.nix | 2 +- modules/dev/cc.nix | 2 +- modules/dev/editors/emacs/default.nix | 2 +- modules/dev/python.nix | 2 +- modules/hardware/nvidia/default.nix | 5 ++-- modules/hardware/pipewire/default.nix | 3 ++- 9 files changed, 24 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index bba9a853..5c9c2f81 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1722253092, - "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", + "lastModified": 1723124175, + "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", + "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", "type": "github" }, "original": { @@ -31,11 +31,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1723050746, - "narHash": "sha256-9VwSLorP6M37N58bxwuKTs8LQjb6o//0rIrZ2MlR+4g=", + "lastModified": 1723194729, + "narHash": "sha256-IPAZexYuOUCCsuBNIE/BYDCaeqGvJpEUR+G0qatx3M4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fe8d3b87057c262e2b4aaa0ec0eb6c3bb6bacf31", + "rev": "efbdeccca60da278c7a52c8d5f386c6cc7655c95", "type": "github" }, "original": { @@ -103,32 +103,31 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1723015306, + "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index bf7f1692..03a03712 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,11 @@ description = "Sako's NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; # nixpkgs stable branch + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs stable branch nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # nixpkgs unstable branch home-manager = { # this manages your dotfiles for the most part - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/desktop/apps/nemo/default.nix b/modules/desktop/apps/nemo/default.nix index 6ce55adb..861f1e6d 100644 --- a/modules/desktop/apps/nemo/default.nix +++ b/modules/desktop/apps/nemo/default.nix @@ -9,7 +9,7 @@ in config = lib.mkIf cfg.enable { users.users.sako.packages = with pkgs; [ - cinnamon.nemo + nemo ]; }; } diff --git a/modules/desktop/apps/transmission/default.nix b/modules/desktop/apps/transmission/default.nix index a100a443..2c08d56c 100644 --- a/modules/desktop/apps/transmission/default.nix +++ b/modules/desktop/apps/transmission/default.nix @@ -14,7 +14,7 @@ in config = lib.mkIf cfg.enable { #TODO(sako):: figure out service users.users.sako.packages = with pkgs; [ - transmission-gtk + transmission_4-gtk ]; }; } diff --git a/modules/dev/cc.nix b/modules/dev/cc.nix index 3995f4cf..9157479b 100644 --- a/modules/dev/cc.nix +++ b/modules/dev/cc.nix @@ -19,7 +19,7 @@ in clang-tools cmake-language-server # lint - cpplint + # cpplint ]; }; } diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix index f5fae77b..bb5ce64e 100644 --- a/modules/dev/editors/emacs/default.nix +++ b/modules/dev/editors/emacs/default.nix @@ -116,7 +116,7 @@ in { unoconv # org to pdf # this might be bloat... - texliveFull + texliveMinimal # ement.el pantalaimon # lsp diff --git a/modules/dev/python.nix b/modules/dev/python.nix index dfb8cf6a..db593383 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -18,7 +18,7 @@ in { python3 black python310Packages.pip - nodePackages.pyright + pyright ]; }; } diff --git a/modules/hardware/nvidia/default.nix b/modules/hardware/nvidia/default.nix index 508f4bf4..dfcdcf32 100644 --- a/modules/hardware/nvidia/default.nix +++ b/modules/hardware/nvidia/default.nix @@ -17,10 +17,9 @@ in { }; config = lib.mkIf cfg.enable { - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; # regardless of if you have intel/nvidia diff --git a/modules/hardware/pipewire/default.nix b/modules/hardware/pipewire/default.nix index 2b2e048c..db0333d7 100644 --- a/modules/hardware/pipewire/default.nix +++ b/modules/hardware/pipewire/default.nix @@ -10,7 +10,8 @@ in config = lib.mkIf cfg.enable { # resolve racial conflict between # pulseaudio and pipewire - sound.enable = lib.mkDefault false; + # its deprecated now the west has fallen + # sound.enable = lib.mkDefault false; hardware.pulseaudio.enable = false;