diff --git a/flake.lock b/flake.lock index e9b8349..56e5c14 100644 --- a/flake.lock +++ b/flake.lock @@ -16,22 +16,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -132,29 +116,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs", - "nixpkgs-stable": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1748084900, - "narHash": "sha256-XxVAY/U3qloh2gCy8T8aBj6lXu6DOAX5wH7cTg1QSkE=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "d01c1a4044129f6eddb944f4d71a84e07c139eba", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1747900541, @@ -173,16 +134,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -203,55 +164,17 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1747953325, - "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "ghostty": "ghostty", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "systems": "systems_2" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748054080, - "narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 65cee0c..8aeb634 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,6 @@ systems.url = "github:nix-systems/default"; # Nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - # Cosmic - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - }; # Terminal ghostty = { url = "github:ghostty-org/ghostty"; @@ -36,7 +31,6 @@ , systems , home-manager , nix-darwin - , nixos-cosmic , nix-flatpak , ghostty }: @@ -80,7 +74,6 @@ nix-darwin hlCommonSettings systems - nixos-cosmic nix-flatpak ; specialArgs = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 63cb598..3adc84a 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -5,9 +5,9 @@ let # nfs 111 2049 - 4000 - 4001 - 4002 + 4000 # statdPort + 4001 # lockdPort + 4002 # mountdPort; 20048 # ssh 22 @@ -19,6 +19,7 @@ in imports = [ ./hl-terra1.hardware-configuration.nix ]; skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.nixos.desktop.enable = false; skyg.server.admin.enable = true; skyg.server.exporters.enable = true; diff --git a/modules/lib.nix b/modules/lib.nix index baf241d..69dda2e 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -3,7 +3,6 @@ , nix-darwin , systems , hlCommonSettings -, nixos-cosmic , nix-flatpak , specialArgs }: @@ -42,7 +41,6 @@ let trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; }; } - nixos-cosmic.nixosModules.default home-manager.nixosModules.default nix-flatpak.nixosModules.nix-flatpak ]; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index a840ad0..8ffcef0 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -1,7 +1,6 @@ { pkgs, config, ... }: { # System Packages - services.dbus.enable = true; services.hydra.useSubstitutes = true; programs.dconf.enable = true; programs.nix-ld.enable = true; diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 1f2763f..0c9d71f 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -14,8 +14,8 @@ in pkgs.cosmic-icons ]; services.desktopManager.cosmic.enable = true; - hardware.system76.enableAll = true; - hardware.system76.power-daemon.enable = true; + # hardware.system76.enableAll = true; + # hardware.system76.power-daemon.enable = true; home-manager.users.${config.skyg.user.name}.xdg.configFile = { "cosmic/com.system76.CosmicSettings.Shortcuts/v1/system_actions" = { enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index b284771..ad68752 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -20,6 +20,7 @@ in }; }; config = lib.mkIf cfg.desktop.enable { + services.dbus.enable = true; services.displayManager.enable = true; services.libinput.enable = true; environment.systemPackages = with pkgs; [