From 94a039fef0eebce7758fc5795d0f2d681d0d6940 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 18 Jul 2025 01:02:39 +0200 Subject: [PATCH] update, cosmic --- flake.lock | 52 +++++++++++++------------------------------ flake.nix | 5 +++-- home/firefox.nix | 24 ++++++++++---------- home/slim-desktop.nix | 2 +- system/cosmic.nix | 5 +++++ 5 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 system/cosmic.nix diff --git a/flake.lock b/flake.lock index 5a5e95c..d052c45 100644 --- a/flake.lock +++ b/flake.lock @@ -28,43 +28,43 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1752544374, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1750646418, - "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -77,15 +77,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751030875, - "narHash": "sha256-x4EqjJUyJ3mHRtFYQP+FSDzT4A+1DEDig1LtwTsIJTc=", + "lastModified": 1752752944, + "narHash": "sha256-Tjdl6UwwlnpPfO/W+u6lNMCIY1X2hH3wYjwiMj48GjQ=", "owner": "nix-community", "repo": "nur", - "rev": "48ce5dd4e350f18380810882dd787839c6433dda", + "rev": "1c920036e31c0d5db9d0bb9bd317a2590e7773b6", "type": "github" }, "original": { @@ -100,27 +99,6 @@ "nixpkgs": "nixpkgs", "nur": "nur" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index df0aa1b..4ce31de 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Complete system and home config"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nur.url = "github:nix-community/nur"; }; @@ -22,6 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix + ./system/cosmic.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/firefox.nix b/home/firefox.nix index efb192b..6cb53cd 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -38,7 +38,7 @@ ${config.home.username} = { name = config.home.username; isDefault = true; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ auto-tab-discard keepassxc-browser tampermonkey @@ -48,7 +48,7 @@ ]; search = { force = true; - default = "Google"; + default = "google"; engines = { "Nix Packages" = { urls = [{ @@ -63,61 +63,61 @@ }; "NixOS Wiki" = { urls = [{ template = "https://nixos.wiki/index.php?search={searchTerms}"; }]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; + icon = "https://nixos.wiki/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@nw" ]; }; "NixOS Options" = { urls = [{ template = "https://search.nixos.org/options?query={searchTerms}"; }]; - iconUpdateURL = "https://nixos.org/favicon.png"; + icon = "https://nixos.org/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@no" ]; }; "Home manager options" = { urls = [{ template = "https://home-manager-options.extranix.com/?query={searchTerms}&release=release-24.11"; }]; - iconUpdateURL = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; + icon = "https://mipmip.github.io/home-manager-option-search/images/favicon.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@hm" ]; }; "Google maps" = { urls = [{ template = "http://maps.google.com/?q={searchTerms}"; }]; - iconUpdateURL = "https://www.google.com/images/branding/product/ico/maps15_bnuw3a_32dp.ico"; + icon = "https://www.google.com/images/branding/product/ico/maps15_bnuw3a_32dp.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@gm" ]; }; "Google scholar" = { urls = [{ template = "https://scholar.google.com/scholar?q={searchTerms}"; }]; - iconUpdateURL = "https://scholar.google.com/favicon.ico"; + icon = "https://scholar.google.com/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@gs" ]; }; "UB" = { urls = [{ template = "https://ubffm.hds.hebis.de/Search/Results?lookfor={searchTerms}"; }]; - iconUpdateURL = "https://ubffm.hds.hebis.de/themes/ubffm/images/favicon.ico"; + icon = "https://ubffm.hds.hebis.de/themes/ubffm/images/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@ub" ]; }; "SciHub" = { urls = [{ template = "https://libgen.is/search.php?req={searchTerms}"; }]; - iconUpdateURL = "https://libgen.is/favicon.ico"; + icon = "https://libgen.is/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@lg" ]; }; "Libgen" = { urls = [{ template = "https://libgen.is/search.php?req={searchTerms}"; }]; - iconUpdateURL = "https://libgen.is/favicon.ico"; + icon = "https://libgen.is/favicon.ico"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@lg" ]; }; "Urban Dictionary" = { urls = [{ template = "https://www.urbandictionary.com/define.php?term={searchTerms}"; }]; - iconUpdateURL = "https://www.urbandictionary.com/favicon-32x32.png"; + icon = "https://www.urbandictionary.com/favicon-32x32.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@ud" ]; }; "Leo" = { urls = [{ template = "https://dict.leo.org/englisch-deutsch/{searchTerms}"; }]; - iconUpdateURL = "https://dict.leo.org/img/favicons/ende-32.png"; + icon = "https://dict.leo.org/img/favicons/ende-32.png"; updateInterval = 24 * 60 * 60 * 1000; definedAliases = [ "@leo" ]; }; diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 83d8e02..9181845 100644 --- a/home/slim-desktop.nix +++ b/home/slim-desktop.nix @@ -60,7 +60,7 @@ # secrets libsecret keepassxc - yubikey-manager-qt + yubioath-flutter # geospatial duckdb diff --git a/system/cosmic.nix b/system/cosmic.nix new file mode 100644 index 0000000..e6ffb66 --- /dev/null +++ b/system/cosmic.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + services.desktopManager.cosmic.enable = true; +}