kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ente and enable cosmic

Browse Source
This commit is contained in:
Kopatz
2024-08-19 15:24:29 +02:00
parent 5484575693
commit e608eba9e9
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -729,11 +729,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722913682, "lastModified": 1723858482,
"narHash": "sha256-7KX4YDBpWJFtoWGA/rSRGoc7PfOyshrmyxlhSM2ApAw=", "narHash": "sha256-ibjVgJIcWDRr8NBHDoa0jgi/nVT7l/yQx6EJmwa5FIk=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "b32bb5899e83d45a8f518cc6b8c8fb28ed104f8b", "rev": "cb56227f6aa62646b2d77a292144c921a4b10d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -813,11 +813,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1722791413, "lastModified": 1723688146,
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -937,11 +937,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722824458, "lastModified": 1723774846,
"narHash": "sha256-2k3/geD5Yh8JT1nrGaRycje5kB0DkvQA/OUZoel1bIU=", "narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a8a937c304e62a5098c6276c9cdf65c19a43b1a5", "rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
modules/graphical/cosmic.nix
View File

@@ -1,21 +1,19 @@
{ config, pkgs, inputs, lib, ... }: { config, pkgs, inputs, lib, ... }:
with lib;
let let
cfg = config.custom.graphical.cosmic; cfg = config.custom.graphical.cosmic;
in in
{ {
options.custom.graphical.cosmic = { options.custom.graphical.cosmic = {
enable = mkEnableOption "Enables cosmic"; enable = lib.mkEnableOption "Enables cosmic";
}; };
config = mkIf cfg.enable { config = lib.mkIf cfg.enable {
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = if (config.custom.graphical.sddm.enable == false) then true else false;
}; };
} }

2
pkgs/ente-frontend/default.nix
View File

@@ -7,7 +7,7 @@ buildNpmPackage rec {
src = "${(fetchGit { src = "${(fetchGit {
url = "git@github.com:oberprofis/ente.git"; url = "git@github.com:oberprofis/ente.git";
ref = "master"; ref = "master";
rev = "9a3545396fded13006fe804b2e75020ad65b9eaf"; rev = "336db364d0a16f8a64abf309f3f1dede6caab2f2";
})}/website/tracker-site"; })}/website/tracker-site";
npmDepsHash = "sha256-pNU7Y/73iltMSzGbQwUZWdD7GbIToXMFR5y763Bi50o="; npmDepsHash = "sha256-pNU7Y/73iltMSzGbQwUZWdD7GbIToXMFR5y763Bi50o=";

2
systems/pc/configuration.nix
View File

@@ -66,7 +66,7 @@
i3.enable = true; i3.enable = true;
hyprland.enable = true; hyprland.enable = true;
#gnome.enable = true; #gnome.enable = true;
#cosmic.enable = true; cosmic.enable = true;
shared.enable = true; shared.enable = true;
stylix.enable = true; stylix.enable = true;
}; };