diff --git a/flake.lock b/flake.lock index 48222e4..10d64fc 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,27 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1743505743, + "narHash": "sha256-BGQo5M36eA7g1sNwAAt4QDFsqjfUqcUKiJhKL6f9af0=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "7858821f17bc6c818c798d2d9d1b78768f822aa1", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1743167577, @@ -1104,7 +1141,39 @@ "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": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1742889210, "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", @@ -1120,7 +1189,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -1223,8 +1292,9 @@ "mysecrets": "mysecrets", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "sops-nix": "sops-nix", "stylix": "stylix" } @@ -1267,6 +1337,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,12 +1385,12 @@ "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", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "systems": "systems_5", "tinted-foot": "tinted-foot", diff --git a/flake.nix b/flake.nix index 126211f..144ab23 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"; 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/cosmic/default.nix b/modules/home/desktop/cosmic/default.nix new file mode 100644 index 0000000..459dc37 --- /dev/null +++ b/modules/home/desktop/cosmic/default.nix @@ -0,0 +1,19 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; let + cfg = config.desktop.cosmic; +in { + options = { + desktop.cosmic.enable = + mkEnableOption "enable cosmic desktop"; + }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + wl-clipboard-rs + ]; + }; +} 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 82461ef..25a44d9 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,6 +1,6 @@ { imports = [ - # ./cosmic.nix + ./cosmic.nix ./gnome.nix ./hyprland.nix ./niri.nix