From b5f6ed9d18baec66769203a445cc194e7423b8e1 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 27 Nov 2024 05:55:53 +0100 Subject: [PATCH] 247 current 2024-11-27 05:49:17 24.11.20241123.0c58267 6.12.1 * --- flake.lock | 26 +++++++++++++------------- flake.nix | 3 ++- modules/software/software.nix | 5 +++-- modules/wm_and_de/hyprland.nix | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 28f9a57..86d3325 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1731698554, - "narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=", + "lastModified": 1732304879, + "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8db1648a95446d41e97ace7caf54e172669810ff", + "rev": "c84579946c03c996916be0fb6e1340f444c277af", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -54,27 +54,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2ab5d79..8cb48d3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,10 @@ ###### inputs = { ###### + #nixpkgs-old.url = "github:NixOS/nixpkgs/nixos-24.05"; # Main nix package repository - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # NixOS unstable channel nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/modules/software/software.nix b/modules/software/software.nix index a971839..5e35767 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -49,6 +49,7 @@ ripgrep qemu home-manager + dfc # move to homemanager? unstable.mumble @@ -62,13 +63,13 @@ keepassxc #minecraft element-desktop - rustdesk-flutter + rustdesk timer ]; fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf dina-font diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 8796f33..e5ba3b1 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -83,6 +83,6 @@ lxqt.lxqt-policykit # file manager - gnome.nautilus + nautilus ]; }