Switch to semi-official sxmo-nix packaging

This commit is contained in:
Kiana Sheibani 2023-01-14 15:03:31 -05:00
parent 549ebb008c
commit b67286cae0
3 changed files with 26 additions and 135 deletions

View file

@ -1,20 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -37,22 +22,6 @@
"type": "github" "type": "github"
} }
}, },
"mnc": {
"flake": false,
"locked": {
"lastModified": 1630107213,
"narHash": "sha256-S7MBIxuYI+cc8OMQULt7VS7ouPqhq0Jk+rz6E5GyKac=",
"owner": "~anjan",
"repo": "mnc",
"rev": "3c887e23f9c659a57b588f09efb1d1ca1ea79324",
"type": "sourcehut"
},
"original": {
"owner": "~anjan",
"repo": "mnc",
"type": "sourcehut"
}
},
"mobile-nixos": { "mobile-nixos": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -112,112 +81,21 @@
} }
}, },
"sxmo": { "sxmo": {
"inputs": { "flake": false,
"flake-utils": "flake-utils",
"mnc": "mnc",
"nixpkgs": [
"nixpkgs"
],
"sxmo-dmenu": "sxmo-dmenu",
"sxmo-dwm": "sxmo-dwm",
"sxmo-st": "sxmo-st",
"sxmo-surf": "sxmo-surf",
"sxmo-utils": "sxmo-utils"
},
"locked": { "locked": {
"lastModified": 1673672934, "lastModified": 1670262526,
"narHash": "sha256-UcHnX5BG+An49ZziNhhmLXQEfRunPtgyyG85IgI0gVU=", "narHash": "sha256-Rkv5CR31ZrDxbGbOeZMyOXqPdIGKCFd2PNRJs1aiBd8=",
"owner": "kiana-S", "owner": "wentam",
"repo": "nixos-sxmo", "repo": "sxmo-nix",
"rev": "c7c3c272ff87588f5f94191181f4da0f648a7d76", "rev": "74129afef2e5ebc874fc3b02bbda863c8c2a0cdc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "kiana-S", "owner": "wentam",
"repo": "nixos-sxmo", "repo": "sxmo-nix",
"type": "github" "type": "github"
} }
}, },
"sxmo-dmenu": {
"flake": false,
"locked": {
"lastModified": 1646057610,
"narHash": "sha256-r5E1XhefEvUKRpMVGp/77ewzUHNTc6CuiFtQwjh4CWk=",
"owner": "~mil",
"repo": "sxmo-dmenu",
"rev": "623f3c85268d243f3bcd618ad041a501dd2ce9bd",
"type": "sourcehut"
},
"original": {
"owner": "~mil",
"repo": "sxmo-dmenu",
"type": "sourcehut"
}
},
"sxmo-dwm": {
"flake": false,
"locked": {
"lastModified": 1650350309,
"narHash": "sha256-/q4QdXWDlNkhsLudAehAxofDs7BCMRAPna0S9gDZjZs=",
"owner": "~mil",
"repo": "sxmo-dwm",
"rev": "c81feda618396ac61f2e1462999053797f58fc05",
"type": "sourcehut"
},
"original": {
"owner": "~mil",
"repo": "sxmo-dwm",
"type": "sourcehut"
}
},
"sxmo-st": {
"flake": false,
"locked": {
"lastModified": 1627649866,
"narHash": "sha256-yqm1/hZq+ekAfyplmOm4wcf4QEs1/RXXhYa4fgMGhNo=",
"owner": "~mil",
"repo": "sxmo-st",
"rev": "853f4112a9c1ed0f2c5273c91c20750529b8a75f",
"type": "sourcehut"
},
"original": {
"owner": "~mil",
"repo": "sxmo-st",
"type": "sourcehut"
}
},
"sxmo-surf": {
"flake": false,
"locked": {
"lastModified": 1609378244,
"narHash": "sha256-Eq12GiHOgeAfUVfVYX7yVDdKXA9yOETtDU3ewO+1dOA=",
"owner": "~mil",
"repo": "sxmo-surf",
"rev": "aa1335528a95bee671efc803e14b432fcf74e746",
"type": "sourcehut"
},
"original": {
"owner": "~mil",
"repo": "sxmo-surf",
"type": "sourcehut"
}
},
"sxmo-utils": {
"flake": false,
"locked": {
"lastModified": 1673266310,
"narHash": "sha256-xBE5MB7zUK6AsjkOgSfIuQLhu1j17UbadW9w3ODKmu8=",
"owner": "~mil",
"repo": "sxmo-utils",
"rev": "ad5102f6e15f752a425a16e11ff44e9e28e73e63",
"type": "sourcehut"
},
"original": {
"owner": "~mil",
"repo": "sxmo-utils",
"type": "sourcehut"
}
},
"tokyo-night-sddm-src": { "tokyo-night-sddm-src": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -7,8 +7,8 @@ inputs = {
mobile-nixos.url = "github:wentam/mobile-nixos/ppp-pr"; mobile-nixos.url = "github:wentam/mobile-nixos/ppp-pr";
mobile-nixos.flake = false; mobile-nixos.flake = false;
sxmo.url = "github:kiana-S/nixos-sxmo"; sxmo.url = "github:wentam/sxmo-nix";
sxmo.inputs.nixpkgs.follows = "nixpkgs"; sxmo.flake = false;
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -85,7 +85,8 @@ outputs = { self,
./hardware-configuration/mobile.nix ./hardware-configuration/mobile.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
(import (mobile-nixos + /lib/configuration.nix) { device = "pine64-pinephonepro"; }) (import (mobile-nixos + /lib/configuration.nix) { device = "pine64-pinephonepro"; })
sxmo.nixosModules.sxmo (sxmo + modules/sxmo/sxmo.nix)
(sxmo + modules/tinydm)
{ {
home-manager.users.${username} = import ./mobile/home-manager.nix; home-manager.users.${username} = import ./mobile/home-manager.nix;

View file

@ -1,8 +1,20 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, username, ... }:
{ {
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.pulseaudio.package = pkgs.pulseaudioFull; hardware.pulseaudio.package = pkgs.pulseaudioFull;
zramSwap.enable = true; zramSwap.enable = true;
services.xserver.windowManager.sxmo.enable = true; # SWMO
services.xserver = {
enable = true;
desktopManager.sxmo.enable = true;
displayManager = {
tinydm.enable = true;
autoLogin.enable = true;
autoLogin.user = username;
defaultSession = "swmo";
}
};
} }