From 946fe2357d8d2fa1b8d2b93c774f8e56bdc963af Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 4 Jan 2025 02:24:04 +0000 Subject: [PATCH] updated --- configuration.nix | 10 ++--- flake.lock | 105 ++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 51 +++++++++++++++------- nixos-cosmic | 2 +- packages.nix | 3 ++ 5 files changed, 149 insertions(+), 22 deletions(-) create mode 100644 flake.lock diff --git a/configuration.nix b/configuration.nix index 39ad1f6..a3a70ac 100644 --- a/configuration.nix +++ b/configuration.nix @@ -89,10 +89,10 @@ # XDG Portals Configuration for Wayland xdg.portal = { - enable = flase; - extraPortals = [ - pkgs.xdg-desktop-portal - ]; + enable = true; + #extraPortals = [ + # pkgs.xdg-desktop-portal + #]; }; # Configure console keymap @@ -103,7 +103,7 @@ # Enable sound with pipewire. hardware.pulseaudio.enable = false; - sound.enable = true; + #sound.enable = true; services.flatpak.enable = true; services.blueman.enable = true; security.rtkit.enable = true; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..3d1536c --- /dev/null +++ b/flake.lock @@ -0,0 +1,105 @@ +{ + "nodes": { + "flake-compat": { + "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" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1735955646, + "narHash": "sha256-9KMkTtDYkZmqSZP6iKTY3zAcDK3xaD5gmiFG5siB8kE=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "f8b8aa18abde0b84c84da69a86b7fb3761a4ddf7", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixos-cosmic": "nixos-cosmic", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735871325, + "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a599f011db521766cbaf7c2f5874182485554f00", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index e951557..8b709d6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,25 +1,44 @@ { inputs = { - nixpkgs.follows = "nixos-cosmic/nixpkgs-stable"; # NOTE: change "nixpkgs" to "nixpkgs-stable" to use stable NixOS release + # This points to the same nixpkgs that nixos-cosmic is using by default. + # If you want to stick to a stable channel, you can switch "nixpkgs" to "nixpkgs-stable". + nixpkgs.follows = "nixos-cosmic/nixpkgs"; + # The main input: NixOS COSMIC nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; }; - outputs = { self, nixpkgs, nixos-cosmic }: { - nixosConfigurations = { - # NOTE: change "host" to your system's hostname - host = nixpkgs.lib.nixosSystem { - modules = [ - { - nix.settings = { - substituters = [ "https://cosmic.cachix.org/" ]; - trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; - }; - } - nixos-cosmic.nixosModules.default - ./configuration.nix - ]; + outputs = { self, nixpkgs, nixos-cosmic }: + { + nixosConfigurations = { + # Replace "my-hostname" with your actual hostname + hypr-nix = nixpkgs.lib.nixosSystem { + # Point to an existing configuration file or create a new one + modules = [ + # Set up the COSMIC binary cache (substituter) + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; + }; + } + + # Import the default COSMIC NixOS module + nixos-cosmic.nixosModules.default + + # Your existing configuration – typically you’d have: + ./configuration.nix + + # Optionally, you could enable COSMIC right here: + { + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; + } + ]; + }; }; }; - }; } + diff --git a/nixos-cosmic b/nixos-cosmic index 3279f5f..f8b8aa1 160000 --- a/nixos-cosmic +++ b/nixos-cosmic @@ -1 +1 @@ -Subproject commit 3279f5f6b35be38302d5f4de8333490174a14326 +Subproject commit f8b8aa18abde0b84c84da69a86b7fb3761a4ddf7 diff --git a/packages.nix b/packages.nix index 555a73d..61caa20 100644 --- a/packages.nix +++ b/packages.nix @@ -25,6 +25,7 @@ in simplescreenrecorder webcord unstable.vscode + unstable.hyprsunset tor-browser monero-gui htop @@ -162,6 +163,8 @@ in alacritty lolcat protontricks + unstable.zed-editor + unstable.ghostty ]; }