From 1050e28b9f36a6737c00fa05272258f141d2cf96 Mon Sep 17 00:00:00 2001 From: Joakim Repomaa Date: Thu, 30 Jan 2025 15:23:21 +0200 Subject: [PATCH] switch to stable Revert "radish: fix deprecation warning" This reverts commit 2d1d2c5839f2aff62a50886dcf5b34f3a9a88d15. --- flake.lock | 49 +++--- flake.nix | 10 +- radish/desktop.nix | 2 +- radish/flake.lock | 277 --------------------------------- radish/home/common/default.nix | 7 +- radish/home/jokke/default.nix | 1 + 6 files changed, 37 insertions(+), 309 deletions(-) delete mode 100644 radish/flake.lock diff --git a/flake.lock b/flake.lock index 1405485..8784f86 100644 --- a/flake.lock +++ b/flake.lock @@ -248,15 +248,16 @@ ] }, "locked": { - "lastModified": 1738145391, - "narHash": "sha256-/9mfbWYN9HDQbKa2HdAe2T5e3FfY8e4eqc1FIvAyvLg=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b4f2a48168b3d90e11365552d1e7e601a4be6b6", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -409,22 +410,6 @@ "type": "github" } }, - "nixpkgs-small": { - "locked": { - "lastModified": 1738133703, - "narHash": "sha256-wYgv4GjKKehMuPrROaKS003JEeSvSufgJ17fg6L1srI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "11c8e6aebf3a42be1f824200c98250b00f854814", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -441,6 +426,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1702151865, @@ -490,16 +491,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738163270, + "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -563,7 +564,7 @@ "nextcloud": "nextcloud", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", - "nixpkgs-small": "nixpkgs-small", + "nixpkgs-unstable": "nixpkgs-unstable", "vimpeccable": "vimpeccable", "windline-nvim": "windline-nvim" } diff --git a/flake.nix b/flake.nix index 22daf89..2ace8fd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nextcloud = { url = "github:onny/nixos-nextcloud-testumgebung"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +17,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs = { nixpkgs.follows = "nixpkgs"; }; @@ -44,7 +44,7 @@ }; ksoloti-pr.url = "github:repomaa/nixpkgs/pkg/ksoloti"; }; - outputs = { nixpkgs, nixpkgs-small, gtrackmap, ksoloti-pr, lanzaboote, nixos-hardware, auto-cpufreq, home-manager, ... }@inputs: { + outputs = { nixpkgs, nixpkgs-unstable, gtrackmap, ksoloti-pr, lanzaboote, nixos-hardware, auto-cpufreq, home-manager, ... }@inputs: { nixosConfigurations.freun-dev = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; @@ -57,7 +57,7 @@ nixosConfigurations.radish = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; specialArgs = { - pkgs-small = import nixpkgs-small { inherit system; }; + pkgs-unstable = import nixpkgs-unstable { inherit system; }; ksoloti-pr = import ksoloti-pr { inherit system; }; inherit inputs system; }; diff --git a/radish/desktop.nix b/radish/desktop.nix index 3d4c56c..9501ff8 100644 --- a/radish/desktop.nix +++ b/radish/desktop.nix @@ -16,7 +16,7 @@ pulse.enable = true; jack.enable = true; }; - services.pulseaudio.enable = false; + hardware.pulseaudio.enable = false; programs.steam = { enable = true; diff --git a/radish/flake.lock b/radish/flake.lock deleted file mode 100644 index 394bef8..0000000 --- a/radish/flake.lock +++ /dev/null @@ -1,277 +0,0 @@ -{ - "nodes": { - "auto-cpufreq": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726162350, - "narHash": "sha256-SI2pDWGKqRJh48wGLovsVT4xPXTZZjM2zaOP3HpUPTE=", - "owner": "AdnanHodzic", - "repo": "auto-cpufreq", - "rev": "7b03630a5e094fc2ef58492d6be35bf64c387815", - "type": "github" - }, - "original": { - "owner": "AdnanHodzic", - "repo": "auto-cpufreq", - "type": "github" - } - }, - "crane": { - "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "ksoloti-pr": { - "locked": { - "lastModified": 1718526298, - "narHash": "sha256-Ew3ebuFbMVOkHsGNTwD7g4Bm/ODRtJCRUWYd1Ub4J7k=", - "owner": "repomaa", - "repo": "nixpkgs", - "rev": "2ee854727a514069c8369bce5d3dbd7ca1f32d99", - "type": "github" - }, - "original": { - "owner": "repomaa", - "ref": "pkg/ksoloti", - "repo": "nixpkgs", - "type": "github" - } - }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "lanzaboote", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1730025694, - "narHash": "sha256-Isj+5RY86+N+JrotqpaXqi6hUAABcF6pIOlIWy2leC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "23664a7358c599dd4f975f16cea0865bf423e83d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-small": { - "locked": { - "lastModified": 1730403368, - "narHash": "sha256-b+whD5HBiD4niTz67HtOv8lMg3fnYdAxHgi52rsAGFA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20499cc102964a175b595bd459f447d25abd6130", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-hooks-nix": { - "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "auto-cpufreq": "auto-cpufreq", - "ksoloti-pr": "ksoloti-pr", - "lanzaboote": "lanzaboote", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "nixpkgs-small": "nixpkgs-small" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/radish/home/common/default.nix b/radish/home/common/default.nix index 4901378..b3fa41a 100644 --- a/radish/home/common/default.nix +++ b/radish/home/common/default.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, inputs, ... }: +let + nerdfonts = pkgs.nerdfonts.override { fonts = [ "IosevkaTerm" ]; }; +in { nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ (import ../custom-pkgs { inherit lib inputs; }) ]; @@ -20,7 +23,7 @@ yubikey-manager gcc sqlite - nerd-fonts.iosevka-term + nerdfonts noto-fonts noto-fonts-cjk-sans noto-fonts-emoji @@ -102,7 +105,7 @@ kitty = { enable = true; font = { - package = pkgs.nerd-fonts.iosevka-term; + package = nerdfonts; name = "IosevkaTerm NFM"; size = 12; }; diff --git a/radish/home/jokke/default.nix b/radish/home/jokke/default.nix index 377a794..9e7af84 100644 --- a/radish/home/jokke/default.nix +++ b/radish/home/jokke/default.nix @@ -26,6 +26,7 @@ jellyfin-media-player darktable openscad + shutter ]; gnome.profilePicture = ../assets/profile-pictures/jokke.png;