From 5b97f8acad9540ade9cc6d87517f4e4dda12bd48 Mon Sep 17 00:00:00 2001 From: Johannes Hendrik Gerard van der Weide Date: Tue, 29 Oct 2024 12:59:37 +0100 Subject: [PATCH] I've been using this for a while, will now change some thing --- desktop.nix | 3 +- flake.lock | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 5 ++- packages.nix | 7 ++++ programs.nix | 4 +++ settings.nix | 1 + 6 files changed, 110 insertions(+), 3 deletions(-) diff --git a/desktop.nix b/desktop.nix index 9a36d4d..85279f6 100644 --- a/desktop.nix +++ b/desktop.nix @@ -2,12 +2,13 @@ { services = { + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic.enable = true; libinput.enable = true; xserver = { enable = true; xkb.variant = "us"; xkb.layout = "nl"; - displayManager.gdm.enable = true; desktopManager = { gnome.enable = true; xterm.enable = false; diff --git a/flake.lock b/flake.lock index f56e5ff..3f2ab7b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "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" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -68,6 +84,27 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1728616391, + "narHash": "sha256-xFQpxbBYaPktRuM9XBEJfWKGbq8odEikZP77+d/0o44=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "c0fe031a0bb89e6641f9ab3fb0d413babe4845d4", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1727665282, @@ -85,6 +122,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1727802920, "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", @@ -102,8 +171,30 @@ "root": { "inputs": { "lix-module": "lix-module", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728527353, + "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index 609258c..3d00f0f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "nixpkgs/nixos-unstable"; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; @@ -13,7 +14,8 @@ outputs = { self, nixos-hardware, - nixpkgs, + nixpkgs, + nixos-cosmic, lix-module, ... }@inputs: @@ -31,6 +33,7 @@ laptop = lib.nixosSystem { inherit system; modules = [ + nixos-cosmic.nixosModules.default nixos-hardware.nixosModules.framework-11th-gen-intel lix-module.nixosModules.default ./users.nix diff --git a/packages.nix b/packages.nix index 918930c..28dd7c6 100644 --- a/packages.nix +++ b/packages.nix @@ -19,6 +19,7 @@ ]; # Systemwide installed packages systemPackages = with pkgs; [ + glib bottom curl wget @@ -34,12 +35,18 @@ firefox thunderbird blackbox-terminal + processing apostrophe onlyoffice-bin keepassxc stremio vesktop signal-desktop + quickemu + spotify + vlc + inkscape + godot_4 ]; }; diff --git a/programs.nix b/programs.nix index 004ef02..e85fd5d 100644 --- a/programs.nix +++ b/programs.nix @@ -12,5 +12,9 @@ theme = "gnzh"; }; }; + + steam = { + enable = true; + }; }; } diff --git a/settings.nix b/settings.nix index 45590ed..df2d35b 100644 --- a/settings.nix +++ b/settings.nix @@ -5,6 +5,7 @@ experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; + sandbox = false; }; };