diff --git a/flake.lock b/flake.lock index 41a2053..e7466a0 100755 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1744662018, - "narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=", + "lastModified": 1746548387, + "narHash": "sha256-GYk8aP4eRg5SuMXZqx+oYURmQqwLip4Ak/n1K0sI0MQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6318c913eb1b29236050bbb0202d957c6ae97191", + "rev": "1b140c87692a5b3dcf8229ae3677a4d7a121c4e5", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1744919155, - "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "desktop-nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -164,16 +164,16 @@ }, "desktop-nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1746663398, + "narHash": "sha256-gdmqhD5pJfHdie6/ceFaxNNSMUuxCo4VwdCn1XtZ46w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "58e670273a92a3c024f07849fcd7c74b0b297f69", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "staging-next", "repo": "nixpkgs", "type": "github" } @@ -185,11 +185,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744618085, - "narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=", + "lastModified": 1746427067, + "narHash": "sha256-MlBKT0A2nK8LHDkeg3jrG2wo80C1bSGyT2tmKrc6pM0=", "owner": "nix-community", "repo": "fenix", - "rev": "a85d390a5607188dca2dbc39b5b37571651d69ce", + "rev": "9e7d648c1f8fdf7beb9b0b1abb3a41d0d8b5fb05", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1744659400, - "narHash": "sha256-q0wwsR/hvOjj1G8ogdudX5cU0IE/Vgvgjo9g9OpQv5U=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a096a8822cb98584c5dc4f2616dcd5ed394bfd7", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1744648917, - "narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=", + "lastModified": 1746158343, + "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5", + "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac", "type": "github" }, "original": { @@ -677,9 +677,7 @@ "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": [ - "nas-nixpkgs-stable" - ], + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix", "systems": "systems" }, @@ -982,11 +980,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -1108,6 +1106,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1744932701, "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", @@ -1364,11 +1378,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1744539868, - "narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=", + "lastModified": 1746332785, + "narHash": "sha256-d4/WBcspAR38AMsZysrQsenF1NmZ0/9GhjD4hxvPygo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c", + "rev": "3b57c001518aeb42511e177221f98ecf42104016", "type": "github" }, "original": { @@ -1485,7 +1499,7 @@ "flake-schemas": "flake-schemas_2", "home-manager": "home-manager_2", "jovian": "jovian_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1745232749, diff --git a/flake.nix b/flake.nix index b14dd4b..9046a65 100755 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ # nixpgs desktop-nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; + url = "github:NixOS/nixpkgs/staging-next"; }; # Chaotic-nix diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 1394bae..cc2145a 100755 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -35,6 +35,7 @@ let memtest86-efi memtest86plus nano + occt onlyoffice-bin os-prober nil @@ -88,6 +89,26 @@ let voltage_offset: 0 power_states: {} ''; + occt = pkgs.stdenv.mkDerivation { + pname = "occt"; + version = "14.0.10"; + + src = pkgs.fetchurl { + url = "https://www.ocbase.com/download-bin/edition:Personal/os:Linux"; + sha256 = "sha256-UKObmwQpYMuG6D6jb5Wrs0FO/sxijUlHqCezG45KqJc="; + }; + + dontUnpack = true; + + buildPhase = '' + mkdir -p $out/bin + cp $src $out/bin/OCCT + chmod +x $out/bin/OCCT + ''; + + + installPhase = "true"; + }; in { imports = [ @@ -101,6 +122,7 @@ in ./users.nix ../default.nix ../../share/amd + # ../../modules/desktop-environments/cosmic/specialisation.nix ]; # Environment configuration @@ -141,6 +163,23 @@ in # Programs configuration programs = { + nix-ld = { + enable = true; + libraries = with pkgs; [ + bash + glib + libgcc + icu + zlib + fontconfig + xorg.libX11 + xorg.libICE + xorg.libSM + xorg.libXcursor + xorg.libXrandr + xorg.libXi + ]; + }; gamemode.enable = true; coolercontrol.enable = true; kdeconnect = { diff --git a/hosts/desktop/services.nix b/hosts/desktop/services.nix index eb212db..3209b8e 100755 --- a/hosts/desktop/services.nix +++ b/hosts/desktop/services.nix @@ -9,8 +9,8 @@ in desktopManager.gnome.enable = true; # Enable Desktop Environment. displayManager = { - gdm.enable = lib.mkForce true; - gdm.wayland = lib.mkForce true; + gdm.enable = lib.mkDefault true; + gdm.wayland = lib.mkDefault true; }; }; diff --git a/modules/desktop-environments/cosmic/specialisation.nix b/modules/desktop-environments/cosmic/specialisation.nix new file mode 100755 index 0000000..ecdc2d9 --- /dev/null +++ b/modules/desktop-environments/cosmic/specialisation.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +{ + specialisation.cosmic.configuration = { + services = { + desktopManager.cosmic.enable = lib.mkForce true; + displayManager.cosmic-greeter.enable = lib.mkForce true; + # Disable Gnome + xserver = { + desktopManager.gnome.enable = lib.mkForce false; + # Enable Desktop Environment. + displayManager = { + gdm.enable = lib.mkForce false; + gdm.wayland = lib.mkForce false; + }; + }; + }; + }; +}