tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-12 10:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from tomasriveral/laptop

Browse Source 
Laptop
This commit is contained in:
tomasr
2026-06-06 19:06:22 +02:00
committed by GitHub
parent a0dd94cb3c a63984816d
commit f491282dad
6 changed files with 37 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+3 -2
View File
@@ -7,7 +7,7 @@
nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
# This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone
nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
#nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme";
home-manager = {
url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs";
@@ -62,7 +62,8 @@
};
pkgs = mkPkgs inputs.nixpkgs;
pkgs-unstable = mkPkgs inputs.nixpkgs-unstable;
pkgs-local = mkPkgs inputs.nixpkgs-local;
pkgs-local = mkPkgs inputs.nixpkgs-unstable;
#pkgs-local = mkPkgs inputs.nixpkgs-local;
in {
inherit pkgs pkgs-unstable pkgs-local;
};
modules/applications/neovim.nix
+1 -1
View File
@@ -1,5 +1,5 @@
_: {
flake.homeModules.neovim = {pkgs-unstable, pkgs-local,...}: {
flake.homeModules.neovim = {pkgs-unstable, ...}: {
programs.neovim = {
withRuby = false;
withPython3 = false;
modules/hardware/disko/disko-config.nix
+31 -60
View File
@@ -24,56 +24,41 @@ _: {
};
};
luks = {
root = {
size = "100%";
content = {
type = "luks";
name = "cryptroot";
type = "btrfs";
# You will type this password at boot.
settings.allowDiscards = true;
extraArgs = [ "-f" ];
content = {
type = "btrfs";
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
extraArgs = ["-f"];
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
# Keyfile storage.
# This subvolume will contain the key used
# to unlock the HDD automatically.
"@keys" = {
mountpoint = "/keys";
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
};
};
@@ -92,27 +77,13 @@ _: {
type = "gpt";
partitions = {
luks = {
data = {
size = "100%";
content = {
type = "luks";
name = "cryptdata";
# IMPORTANT:
# This keyfile will be created after installation.
# The SSD unlocks first.
# Then this keyfile unlocks the HDD automatically.
settings = {
keyFile = "/keys/hdd.key";
};
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
};
};
modules/hosts/desktop.nix
+2 -2
View File
@@ -7,7 +7,7 @@
flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem {
#system = "x86_64-linux";
specialArgs = {
inherit (self) pkgs-unstable pkgs-local;
inherit (self) pkgs-unstable;
};
modules = with self.nixosModules; [
# important do not remove
@@ -30,7 +30,7 @@
#hardware-configuration-desktop
hyprland
IO
kdrive-desktop # we will setup this later
#kdrive-desktop # we will setup this later
latex
ly
mullvad
modules/packages/hyprlandPlugins.nix
-42
View File
@@ -1,42 +0,0 @@
_: {
perSystem = _: {
packages.hypr-dynamic-cursors-manual = {
lib,
mkHyprlandPlugin,
fetchFromGitHub,
nix-update-script,
}:
mkHyprlandPlugin {
pluginName = "hypr-dynamic-cursors";
version = "0-unstable-2026-05-29";
src = fetchFromGitHub {
owner = "VirtCode";
repo = "hypr-dynamic-cursors";
rev = "1de08deb7d495124ce88b342fecc7e7542d0672f";
hash = "sha256-Ck9dFUfj/zDSab16CzsGWEMNeSNDhhDOB0JWeHzVvjk=";
};
dontUseCmakeConfigure = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib
mv out/dynamic-cursors.so $out/lib/libhypr-dynamic-cursors.so
runHook postInstall
'';
passthru.updateScript = nix-update-script {extraArgs = ["--version=branch"];};
meta = {
description = "Plugin to make your Hyprland cursor more realistic";
homepage = "https://github.com/VirtCode/hypr-dynamic-cursors";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [donovanglover];
platforms = lib.platforms.linux;
};
};
};
}
modules/packages/sbb-tuiManuallyDerived.nix
-44
View File
@@ -1,44 +0,0 @@
_: {
perSystem = {
pkgs,
pkgs-unstable,
...
}: {
packages.sbb-tuiManuallyDerived = pkgs-unstable.buildGoModule (finalAttrs: {
pname = "sbb-tui";
version = "1.14.2";
__structuredAttrs = true;
src = pkgs.fetchFromGitHub {
owner = "Necrom4";
repo = "sbb-tui";
tag = "v${finalAttrs.version}";
hash = pkgs.lib.fakeHash;
};
vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
ldflags = [
"-s"
"-w"
"-X main.version=${finalAttrs.version}"
];
allowGoReference = true;
doCheck = true;
nativeCheckInputs = [pkgs.versionCheckHook];
passthru.updateScript = pkgs.nix-update-script {};
meta = {
description = "TUI client for Switzerland's public transport timetables, inspired by SBB/CFF/FFS app";
homepage = "https://github.com/Necrom4/sbb-tui";
license = pkgs.lib.licenses.mit;
platforms = pkgs.lib.platforms.unix;
maintainers = with pkgs.lib.maintainers; [tomasrivera];
mainProgram = "sbb-tui";
};
});
};
}