Compare commits
7 Commits
fef153c9d8
...
main
Author | SHA1 | Date | |
---|---|---|---|
c0f9f1d622
|
|||
c1e22f2e7b
|
|||
bcdd79d400
|
|||
5de2d44c01
|
|||
d13363f709
|
|||
6d1a757145
|
|||
b874613227
|
40
flake.lock
generated
40
flake.lock
generated
@ -5,48 +5,63 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732466619,
|
"lastModified": 1749154018,
|
||||||
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
|
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f3111f62a23451114433888902a55cf0692b408d",
|
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"ref": "release-25.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-hardware": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1750431636,
|
||||||
|
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731755305,
|
"lastModified": 1749024892,
|
||||||
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
"narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
"rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732350895,
|
"lastModified": 1750259320,
|
||||||
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
|
"narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
|
"rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-25.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -54,6 +69,7 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
||||||
|
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ { self, nixpkgs, ... }: {
|
outputs = inputs @ { self, nixpkgs, ... }: {
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{ pkgs, ... }: {
|
{ inputs, pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
inputs.nixos-hardware.nixosModules.chuwi-minibook-x
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./n100.nix
|
./n100.nix
|
||||||
../../profiles/base
|
../../profiles/base
|
||||||
@ -14,12 +15,10 @@
|
|||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.kernelPackages = pkgs.linuxPackages_6_13;
|
||||||
#boot.kernelPackages = pkgs.linuxPackages_6_6;
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"fbcon=rotate:1"
|
|
||||||
# disable panel self refresh for i915
|
# disable panel self refresh for i915
|
||||||
"i915.enable_psr=0"
|
#"i915.enable_psr=0"
|
||||||
# set max cstate to 2 (suspend?)
|
# set max cstate to 2 (suspend?)
|
||||||
# "intel_idle.max_cstate=2"
|
# "intel_idle.max_cstate=2"
|
||||||
"nvme.noacpi=1"
|
"nvme.noacpi=1"
|
||||||
@ -46,12 +45,15 @@
|
|||||||
|
|
||||||
# Network
|
# Network
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
networking.networkmanager.unmanaged = [ "p2p-dev-wlp0s20f3" ];
|
||||||
systemd.services.ModemManager.enable = true;
|
systemd.services.ModemManager.enable = true;
|
||||||
|
systemd.services.NetworkManager-wait-online.enable = false;
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
services.avahi.enable = true;
|
services.avahi.enable = true;
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
|
services.power-profiles-daemon.enable = true;
|
||||||
|
|
||||||
# TODO: delete this later
|
# TODO: delete this later
|
||||||
system.stateVersion = "23.05"; # Did you read the comment?
|
system.stateVersion = "23.05"; # Did you read the comment?
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp0s20f0u1u3.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp0s20f0u1u3.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
5
pkgs/default.nix
Normal file
5
pkgs/default.nix
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
final: prev: {
|
||||||
|
cpupower = prev.cpupower.overrideAttrs (oldAttrs: {
|
||||||
|
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.which ];
|
||||||
|
});
|
||||||
|
}
|
@ -1,4 +1,7 @@
|
|||||||
{ inputs, pkgs, ...}: {
|
{ inputs, pkgs, ...}: {
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(import ../../pkgs)
|
||||||
|
];
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
nix.settings.trusted-users = [ "root" "@wheel" ];
|
||||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
usb-modeswitch-data
|
usb-modeswitch-data
|
||||||
modemmanager
|
modemmanager
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-kde
|
kdePackages.xdg-desktop-portal-kde
|
||||||
grim
|
grim
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
libimobiledevice
|
libimobiledevice
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
# Plasma
|
# Plasma
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.displayManager.sddm.enable = true;
|
services.displayManager.sddm.enable = true;
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
xdg-desktop-portal-kde
|
kdePackages.xdg-desktop-portal-kde
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
wget
|
wget
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
nix-diff
|
nix-diff
|
||||||
|
jetbrains.idea-community
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
home-manager.users.transcaffeine = import ./home-manager/default.nix;
|
home-manager.users.transcaffeine = import ./home-manager/default.nix;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, ... }:
|
{ lib, config, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
repo = (builtins.fetchGit {
|
repo = (builtins.fetchGit {
|
||||||
@ -53,4 +53,7 @@ in {
|
|||||||
"no-allow-external-cache" = gpg_agent_config."no-allow-external-cache";
|
"no-allow-external-cache" = gpg_agent_config."no-allow-external-cache";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.file."${config.programs.gpg.homedir}/gpg.conf".enable = false;
|
||||||
|
home.file."${config.programs.gpg.homedir}/gpg-agent.conf".enable = false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user