Remove reference to NUR

This commit is contained in:
Kiana Sheibani 2023-01-07 22:44:17 -05:00
parent 6745b3663f
commit 6696355b19
4 changed files with 46 additions and 28 deletions

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, nur, username, fullname, ... }:
{ config, pkgs, lib, username, fullname, ... }:
let
inherit (config) platform;
isMobile = platform == "mobile";
@ -18,7 +18,6 @@ in
restrict-eval = false
'';
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nur.overlay ];
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
@ -88,11 +87,3 @@ in
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.11"; # Did you read the comment?
}
// lib.mkIf (platform == "mobile") {
hardware.bluetooth.enable = true;
hardware.pulseaudio.package = pkgs.pulseAudioFull;
zramSwap.enable = true;
services.xserver.desktopManager.phosh.user = username;
}

View file

@ -22,6 +22,23 @@
"type": "github"
}
},
"mobile-nixos": {
"flake": false,
"locked": {
"lastModified": 1670190044,
"narHash": "sha256-YA3ochLKXQAv2p5GWHToIJdqJ/iyVIwCBeE5DoSrS0o=",
"owner": "wentam",
"repo": "mobile-nixos",
"rev": "93ce16b1a18e1ef83027d93c1f478926c6d75a76",
"type": "github"
},
"original": {
"owner": "wentam",
"ref": "ppp-pr",
"repo": "mobile-nixos",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1670174919,
@ -53,30 +70,32 @@
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1670387514,
"narHash": "sha256-dSsoDMyoVwy60ZaGJNoCXEzYToYfdV6XYyadnliMJnE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "25c0b2f7f43cbe50bf17f5c190c0aa6231d3754f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"mobile-nixos": "mobile-nixos",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nur": "nur",
"sxmo": "sxmo",
"tokyo-night-sddm-src": "tokyo-night-sddm-src"
}
},
"sxmo": {
"flake": false,
"locked": {
"lastModified": 1621623139,
"narHash": "sha256-oVJGvVDxOc+JzyKu+7L03E3oAjZlI2Aya7YNvBNfkvg=",
"owner": "~noneucat",
"repo": "nur-packages",
"rev": "3211ca63ce22fe86dd1462cc550fd6605614b246",
"type": "sourcehut"
},
"original": {
"owner": "~noneucat",
"repo": "nur-packages",
"type": "sourcehut"
}
},
"tokyo-night-sddm-src": {
"flake": false,
"locked": {

View file

@ -2,12 +2,14 @@
description = "System conf";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
nixos-hardware.url = "github:NixOS/nixos-hardware";
mobile-nixos.url = "github:wentam/mobile-nixos/ppp-pr";
mobile-nixos.flake = false;
sxmo.url = "sourcehut:~noneucat/nur-packages";
sxmo.flake = false;
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
@ -19,6 +21,7 @@ outputs = { self,
home-manager,
nixos-hardware,
mobile-nixos,
sxmo,
...}@inputs:
let
system = "x86_64-linux";
@ -83,6 +86,7 @@ outputs = { self,
./hardware-configuration/mobile.nix
home-manager.nixosModules.home-manager
(import (mobile-nixos + /lib/configuration.nix) { device = "pine64-pinephonepro"; })
(import sxmo { pkgs = import nixpkgs {}; }).modules.pinephone.sxmo
{
home-manager.users.${username} = import ./mobile/home-manager.nix;

View file

@ -1,4 +1,8 @@
{ config, pkgs, lib, ... }:
{
imports = [ pkgs.nur.repos.noneucat.modules.pinephone.sxmo ];
hardware.bluetooth.enable = true;
hardware.pulseaudio.package = pkgs.pulseAudioFull;
zramSwap.enable = true;
services.xserver.windowManager.sxmo.enable = true;
}