diff --git a/flake.lock b/flake.lock index 48222e4..ac6f922 100644 --- a/flake.lock +++ b/flake.lock @@ -271,6 +271,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -1056,6 +1072,29 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1743589597, + "narHash": "sha256-fUTd0BMMlHUG+9E/2fvIJuXKCqSpweY7NetQXZndKPk=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "760c3a4173ff62ab0ad0925cbb39ac166e23803c", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1743167577, @@ -1104,6 +1143,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1743367904, + "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1742889210, @@ -1223,6 +1278,7 @@ "mysecrets": "mysecrets", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", @@ -1267,6 +1323,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743475035, + "narHash": "sha256-uLjVsb4Rxnp1zmFdPCDmdODd4RY6ETOeRj0IkC0ij/4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "bee11c51c2cda3ac57c9e0149d94b86cc1b00d13", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1294,7 +1371,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", diff --git a/flake.nix b/flake.nix index 126211f..8453f9d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ # neve.url = "git+https://gitea.linerds.us/unexplrd/Neve"; nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-index-database.url = "github:nix-community/nix-index-database"; - # nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; # nixvim.url = "github:nix-community/nixvim"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -34,6 +34,7 @@ lix.inputs.nixpkgs.follows = "nixpkgs"; mysecrets.flake = false; # neve.inputs.nixvim.follows = "nixvim"; + nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 169671d..b7ad42e 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -14,7 +14,7 @@ ./users.nix ]; - desktop.niri.enable = true; + desktop.cosmic.enable = true; environment.memoryAllocator.provider = "mimalloc"; locale.ukrainian.enable = true; opentabletdriver.enable = false; diff --git a/hosts/eldrid/configuration.nix b/hosts/eldrid/configuration.nix index 4799740..c03b3f6 100644 --- a/hosts/eldrid/configuration.nix +++ b/hosts/eldrid/configuration.nix @@ -15,7 +15,7 @@ ./users.nix ]; - desktop.niri.enable = true; + desktop.cosmic.enable = true; locale.ukrainian.enable = true; diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index c18c8e5..5ed5ec0 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -1,6 +1,7 @@ { imports = [ ./common/xdg-userdirs.nix + ./cosmic ./gnome ./hyprland ./niri diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 29366e9..3140e4a 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,7 +1,7 @@ { imports = [ ./common/pipewire.nix - # ./cosmic.nix + ./cosmic.nix ./gnome.nix ./hyprland.nix ./niri.nix