doloro/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

surface wip

Browse Source
This commit is contained in:
Doloro1978
2026-04-09 21:38:16 +01:00
parent 8ca46d9edc
commit aa9d3a056f
9 changed files with 182 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/hosts/aspects/doloro-laptop/disko.nix
+1 -1
View File
@@ -35,7 +35,7 @@
}; };
}; };
plainSwap = { plainSwap = {
size = "48G"; size = "24G";
content = { content = {
type = "swap"; type = "swap";
discardPolicy = "both"; # Both "once" and page discard policies discardPolicy = "both"; # Both "once" and page discard policies
config/hosts/aspects/doloro-laptop/hardware.nix
+12 -12
View File
@@ -16,22 +16,22 @@
}: }:
{ {
imports = [ imports = [
(modulesPath + "/hardware/cpu/intel-npu.nix") # (modulesPath + "/hardware/cpu/intel-npu.nix")
(modulesPath + "/installer/scan/not-detected.nix") # (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"thunderbolt"
"vmd"
"nvme"
]; ];
# boot.initrd.availableKernelModules = [
# "xhci_pci"
# "thunderbolt"
# "vmd"
# "nvme"
# ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; # boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; # hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.npu.enable = true; # hardware.cpu.intel.npu.enable = true;
}; };
}; };
} }
config/hosts/aspects/doloro-laptop/home.nix
+11 -11
View File
@@ -14,14 +14,14 @@
<modules/hyprland/doloro-settings> <modules/hyprland/doloro-settings>
modules.sops modules.sops
modules.fish modules.fish
(<modules/helium> { # (<modules/helium> {
default = true; # default = true;
}) # })
modules.kitty modules.kitty
modules.stylix # modules.stylix
modules.quickshell # modules.quickshell
modules.lavd # modules.lavd
modules.podman # modules.podman
# modules.openvivo # modules.openvivo
]; ];
nixos = nixos =
@@ -37,9 +37,9 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
monitor = [ # monitor = [
"eDP-1, 2880x1800@120, 0x0, 2" # "eDP-1, 2880x1800@120, 0x0, 2"
]; # ];
input = { input = {
kb_layout = "gb"; kb_layout = "gb";
follow_mouse = 2; follow_mouse = 2;
@@ -58,7 +58,7 @@
telegram-desktop telegram-desktop
equibop equibop
obsidian obsidian
intel-gpu-tools # intel-gpu-tools
brightnessctl brightnessctl
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
config/hosts/aspects/doloro-laptop/host.nix
+41 -38
View File
@@ -11,30 +11,32 @@
includes = [ includes = [
modules.nix modules.nix
modules.tuigreet modules.tuigreet
<modules/common/laptop-power-management> # <modules/common/laptop-power-management>
modules.fonts modules.fonts
(modules.tdp { modules.surface-patches
batt = { modules.nikpkgs
cpu = { # (modules.tdp {
long-term = 13; # batt = {
short-term = 7; # cpu = {
}; # long-term = 13;
mmio = { # short-term = 7;
long-term = 10; # };
short-term = 7; # mmio = {
}; # long-term = 10;
}; # short-term = 7;
ac = { # };
cpu = { # };
long-term = 120; # ac = {
short-term = 120; # cpu = {
}; # long-term = 120;
mmio = { # short-term = 120;
long-term = 40; # };
short-term = 20; # mmio = {
}; # long-term = 40;
}; # short-term = 20;
}) # };
# };
# })
]; ];
nixos = nixos =
{ pkgs, config, ... }: { pkgs, config, ... }:
@@ -44,10 +46,10 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest
# boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often
boot.kernelPackages = # boot.kernelPackages =
inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; # inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3;
networking.hostName = "doloro-nixos-laptop"; # Define your hostname. networking.hostName = "doloro-nixos-laptop"; # Define your hostname.
security.rtkit.enable = true; # security.rtkit.enable = true;
# Configure network connections interactively with nmcli or nmtui. # Configure network connections interactively with nmcli or nmtui.
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@@ -55,6 +57,7 @@
# Set your time zone. # Set your time zone.
# time.timeZone = "Europe/London"; # time.timeZone = "Europe/London";
services.automatic-timezoned.enable = true; services.automatic-timezoned.enable = true;
networking.wireless.iwd.enable = false;
nix.settings = { nix.settings = {
substituters = [ substituters = [
@@ -75,7 +78,7 @@
]; ];
}; };
services.gnome.gnome-keyring.enable = true; # services.gnome.gnome-keyring.enable = true;
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; };
@@ -86,9 +89,9 @@
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
# vpl-gpu-rt # vpl-gpu-rt
intel-media-driver # VA-API (iHD) userspace # intel-media-driver # VA-API (iHD) userspace
# vpl-gpu-rt # oneVPL (QSV) runtime # vpl-gpu-rt # oneVPL (QSV) runtime
intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe # intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
]; ];
}; };
}; };
@@ -129,7 +132,7 @@
services.libinput.enable = true; services.libinput.enable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.doloro = { # users.users.doloro = {
# isNormalUser = true; # isNormalUser = true;
@@ -157,20 +160,20 @@
boot.kernelParams = [ boot.kernelParams = [
# "mem_sleep_default=deep" # "mem_sleep_default=deep"
"i915.fastboot=1" # "i915.fastboot=1"
"i915.modeset=1" # "i915.modeset=1"
"ahci.mobile_lpm_policy=1" # "ahci.mobile_lpm_policy=1"
"intel_idle.max_cstate=10" # "intel_idle.max_cstate=10"
"processor.max_cstate=10" # "processor.max_cstate=10"
# "quiet" # "quiet"
# "splash" # "splash"
# "idle=halt" # "idle=halt"
]; ];
services.logind.settings.Login = { services.logind.settings.Login = {
HandleLidSwitch = "suspend"; # HandleLidSwitch = "suspend";
HandleLidSwitchExternalPower = "suspend"; # HandleLidSwitchExternalPower = "suspend";
HandleLidSwitchDocked = "ignore"; # HandleLidSwitchDocked = "ignore";
}; };
# systemd.sleep.extraConfig = '' # systemd.sleep.extraConfig = ''
# HibernateDelaySec=30min # HibernateDelaySec=30min
config/hosts/computers.nix
+2 -2
View File
@@ -10,7 +10,7 @@
userName = "doloro"; userName = "doloro";
}; };
# TODO # TODO
den.homes.x86_64-linux.doloro-laptop = { den.homes.aarch64-linux.doloro-laptop = {
userName = "doloro"; userName = "doloro";
}; };
# Machines # Machines
@@ -21,7 +21,7 @@
}; };
}; };
# TODO # TODO
den.hosts.x86_64-linux.laptop = { den.hosts.aarch64-linux.laptop = {
users.doloro = { users.doloro = {
aspect = "doloro-laptop"; aspect = "doloro-laptop";
home-manager.enable = true; home-manager.enable = true;
config/modules/nikpkgs.nix
+19
View File
@@ -0,0 +1,19 @@
{
den,
modules,
inputs,
...
}:
{
flake-file.inputs = {
nik-pkgs = {
url = "git+https://git.scug.io/nikkuss/pkgs.git";
inputs.nixpkgs.follows = "nixpkgs";
};
};
modules.nikpkgs = {
nixos = {
nixpkgs.overlays = [ inputs.nik-pkgs.overlays.default ];
};
};
}
config/modules/surface_patches.nix
+20
View File
@@ -0,0 +1,20 @@
{
den,
modules,
inputs,
...
}:
{
flake-file.inputs = {
x1e-kernel.url = "file:///home/doloro/x1e-kernel-main.zip";
};
modules.surface-patches = {
nixos =
{ pkgs, ... }:
{
imports = with inputs; [
x1e-kernel.nixosModules.default
];
};
};
}
flake.lock
Generated
+71 -3
View File
@@ -309,6 +309,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"font-patcher": { "font-patcher": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
@@ -791,6 +809,27 @@
"type": "github" "type": "github"
} }
}, },
"nik-pkgs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1775766941,
"narHash": "sha256-uDBTnE+ps/f7HFN1kwdKDl+1T0bNz5HO+9x2A6v/M/4=",
"ref": "refs/heads/main",
"rev": "6e29baf59605d3a9da7dbb37076c759f7a4a37ef",
"revCount": 56,
"type": "git",
"url": "https://git.scug.io/nikkuss/pkgs.git"
},
"original": {
"type": "git",
"url": "https://git.scug.io/nikkuss/pkgs.git"
}
},
"niri-flake": { "niri-flake": {
"inputs": { "inputs": {
"niri-stable": "niri-stable", "niri-stable": "niri-stable",
@@ -1012,7 +1051,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1775307257, "lastModified": 1775307257,
@@ -1114,6 +1153,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"import-tree": "import-tree", "import-tree": "import-tree",
"nik-pkgs": "nik-pkgs",
"niri-flake": "niri-flake", "niri-flake": "niri-flake",
"nix-cachyos-kernel": "nix-cachyos-kernel", "nix-cachyos-kernel": "nix-cachyos-kernel",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
@@ -1125,6 +1165,7 @@
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"stylix": "stylix", "stylix": "stylix",
"x1e-kernel": "x1e-kernel",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
@@ -1270,7 +1311,7 @@
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1775421933, "lastModified": 1775421933,
@@ -1299,7 +1340,7 @@
"nixpkgs" "nixpkgs"
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_5", "systems": "systems_6",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
@@ -1394,6 +1435,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -1476,6 +1532,18 @@
"type": "github" "type": "github"
} }
}, },
"x1e-kernel": {
"locked": {
"lastModified": 1775750605,
"narHash": "sha256-qHeSM7bY9FLsdyi4iKsZshYjR/zRm8WJTzO8NmtUfyg=",
"type": "tarball",
"url": "file:///home/doloro/x1e-kernel-main.zip"
},
"original": {
"type": "tarball",
"url": "file:///home/doloro/x1e-kernel-main.zip"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": [
flake.nix
+5
View File
@@ -21,6 +21,10 @@
}; };
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
import-tree.url = "github:vic/import-tree"; import-tree.url = "github:vic/import-tree";
nik-pkgs = {
url = "git+https://git.scug.io/nikkuss/pkgs.git";
inputs.nixpkgs.follows = "nixpkgs";
};
niri-flake = { niri-flake = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -42,6 +46,7 @@
url = "github:nix-community/stylix"; url = "github:nix-community/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
x1e-kernel.url = "file:///home/doloro/x1e-kernel-main.zip";
zen-browser = { zen-browser = {
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";