Compare commits
1 Commits
main
...
cfb95bbedc
Author | SHA1 | Date | |
---|---|---|---|
cfb95bbedc
|
40
flake.lock
generated
40
flake.lock
generated
@ -5,63 +5,48 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749154018,
|
"lastModified": 1732466619,
|
||||||
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
|
"narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
|
"rev": "f3111f62a23451114433888902a55cf0692b408d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-24.11",
|
||||||
"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": 1749024892,
|
"lastModified": 1731755305,
|
||||||
"narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=",
|
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef",
|
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750259320,
|
"lastModified": 1732350895,
|
||||||
"narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
|
"narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
|
"rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@ -69,7 +54,6 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixos-hardware": "nixos-hardware",
|
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ { self, nixpkgs, ... }: {
|
outputs = inputs @ { self, nixpkgs, ... }: {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
{ inputs, pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.nixos-hardware.nixosModules.chuwi-minibook-x
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./n100.nix
|
./n100.nix
|
||||||
../../profiles/base
|
../../profiles/base
|
||||||
@ -15,10 +14,12 @@
|
|||||||
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_6_13;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
#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"
|
||||||
@ -34,26 +35,18 @@
|
|||||||
"cloud.finallycoffee.eu"
|
"cloud.finallycoffee.eu"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
networking.firewall = {
|
|
||||||
enable = true;
|
|
||||||
allowedTCPPorts = [ 8883 ];
|
|
||||||
allowedUDPPorts = [ 2021 ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
# 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,6 +36,7 @@
|
|||||||
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;
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
final: prev: {
|
|
||||||
cpupower = prev.cpupower.overrideAttrs (oldAttrs: {
|
|
||||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ prev.which ];
|
|
||||||
});
|
|
||||||
}
|
|
@ -1,7 +1,4 @@
|
|||||||
{ 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;
|
||||||
|
@ -6,13 +6,10 @@
|
|||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.usbmuxd.enable = true;
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
firefox
|
firefox
|
||||||
thunderbird
|
thunderbird
|
||||||
vlc
|
vlc
|
||||||
orca-slicer
|
|
||||||
usbutils
|
usbutils
|
||||||
pciutils
|
pciutils
|
||||||
pinentry-qt
|
pinentry-qt
|
||||||
@ -21,9 +18,8 @@
|
|||||||
usb-modeswitch-data
|
usb-modeswitch-data
|
||||||
modemmanager
|
modemmanager
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
kdePackages.xdg-desktop-portal-kde
|
xdg-desktop-portal-kde
|
||||||
grim
|
grim
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
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.desktopManager.plasma6.enable = true;
|
services.xserver.desktopManager.plasma5.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
xdg-desktop-portal
|
xdg-desktop-portal
|
||||||
kdePackages.xdg-desktop-portal-kde
|
xdg-desktop-portal-kde
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
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;
|
||||||
|
@ -15,5 +15,4 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
home.preferXdgDirectories = true;
|
home.preferXdgDirectories = true;
|
||||||
programs.firefox = import ./firefox.nix { inherit lib; };
|
|
||||||
}
|
}
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
{ lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
profiles.default = {
|
|
||||||
id = 42;
|
|
||||||
isDefault = true;
|
|
||||||
name = "default";
|
|
||||||
containers = {
|
|
||||||
personal = {
|
|
||||||
id = 1;
|
|
||||||
color = "blue";
|
|
||||||
icon = "fingerprint";
|
|
||||||
name = "transcaffeine.me";
|
|
||||||
};
|
|
||||||
finallycoffee = {
|
|
||||||
id = 2;
|
|
||||||
color = "purple";
|
|
||||||
icon = "fingerprint";
|
|
||||||
name = "finally.coffee";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
extensions = [
|
|
||||||
"uBlock0@raymondhill.net"
|
|
||||||
"uMatrix@raymondhill.net"
|
|
||||||
"{c607c8df-14a7-4f28-894f-29e8722976af}"
|
|
||||||
"default-theme@mozilla.org"
|
|
||||||
"addon@darkreader.org"
|
|
||||||
"@testpilot-containers"
|
|
||||||
"protoots@trans.rights"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, config, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
repo = (builtins.fetchGit {
|
repo = (builtins.fetchGit {
|
||||||
@ -44,16 +44,13 @@ in {
|
|||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableSshSupport = gpg_agent_config."enable-ssh-support";
|
enableSshSupport = gpg_agent_config."enable-ssh-support";
|
||||||
defaultCacheTtl = gpg_agent_config."default-cache-ttl" or 300;
|
defaultCacheTtl = gpg_agent_config."default-cache-ttl";
|
||||||
maxCacheTtl = gpg_agent_config."max-cache-ttl" or 900;
|
maxCacheTtl = gpg_agent_config."max-cache-ttl";
|
||||||
defaultCacheTtlSsh = gpg_agent_config."default-cache-ttl-ssh" or 300;
|
defaultCacheTtlSsh = gpg_agent_config."default-cache-ttl-ssh";
|
||||||
maxCacheTtlSsh = gpg_agent_config."max-cache-ttl-ssh" or 900;
|
maxCacheTtlSsh = gpg_agent_config."max-cache-ttl-ssh";
|
||||||
extraConfig = utils.attrsToConfig {
|
extraConfig = utils.attrsToConfig {
|
||||||
"ignore-cache-for-signing" = gpg_agent_config."ignore-cache-for-signing";
|
"ignore-cache-for-signing" = gpg_agent_config."ignore-cache-for-signing";
|
||||||
"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