Compare commits

...

10 Commits

7 changed files with 90 additions and 47 deletions

52
flake.lock generated
View File

@@ -1,5 +1,22 @@
{ {
"nodes": { "nodes": {
"dotfiles": {
"flake": false,
"locked": {
"lastModified": 1757262504,
"narHash": "sha256-8Hxs9m+vu/DwZtorQOFCGTld0Wlz+QKLFPjLX7J/JDU=",
"ref": "main",
"rev": "7c9567c880f414054fc427d8a2bb0c3a048104ee",
"revCount": 14,
"type": "git",
"url": "https://git.finally.coffee/transcaffeine/dotfiles.git"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.finally.coffee/transcaffeine/dotfiles.git"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -38,18 +55,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1757020766, "lastModified": 1760105160,
"narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", "narHash": "sha256-oYYalpFIVeDolg/zpkPkKk8mBuvnj/lUE3/K7OuTOwk=",
"owner": "NixOS", "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
"repo": "nixpkgs", "type": "tarball",
"rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.810995.5da4a26309e7/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixos-25.05", "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-forked": { "nixpkgs-forked": {
@@ -85,22 +99,20 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1757236331, "lastModified": 1760252326,
"narHash": "sha256-zf1HPzatARa8PFLS7ypOxx2IVpbAWotKYl8Kgu4DYyw=", "narHash": "sha256-5v32B25kSE++E+KtP4DO687r/AlWL9qOlOjtYyfcDSw=",
"owner": "nixOS", "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b",
"repo": "nixpkgs", "type": "tarball",
"rev": "1f46efd9d12bc85e195f4d17aacc372a88a277a5", "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre876242.66e5020bfe0a/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "nixOS", "type": "tarball",
"ref": "master", "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"dotfiles": "dotfiles",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View File

@@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
nixpkgs-unstable.url = "github:nixOS/nixpkgs/master"; nixpkgs-unstable.url = "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz";
nixpkgs-forked.url = "github:transcaffeine/nixpkgs/nexus/3.81.1"; nixpkgs-forked.url = "github:transcaffeine/nixpkgs/nexus/3.81.1";
nixpkgs-local = { nixpkgs-local = {
url = "git+file:/home/transcaffeine/git/transcaffeine/nixpkgs"; url = "git+file:/home/transcaffeine/git/transcaffeine/nixpkgs";
@@ -11,6 +11,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
dotfiles = {
url = "git+https://git.finally.coffee/transcaffeine/dotfiles.git?ref=main";
flake = false;
};
}; };
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: { outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: {

View File

@@ -13,18 +13,29 @@
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems = {
{ device = "/dev/disk/by-uuid/34d0b26e-8d69-4388-bf94-67e44669cdd8"; "/" = {
device = "/dev/disk/by-uuid/34d0b26e-8d69-4388-bf94-67e44669cdd8";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = {
fileSystems."/boot" = device = "/dev/disk/by-uuid/3B4B-0489";
{ device = "/dev/disk/by-uuid/3B4B-0489";
fsType = "vfat"; fsType = "vfat";
}; };
"/home" = {
device = "/dev/disk/by-uuid/a836d70d-ee4d-4973-b3c0-2888d0a60095";
fsType = "btrfs";
};
"/nix/store" = {
device = "/dev/disk/by-uuid/720dd78e-7070-4d5f-a550-cd03bdde93bd";
fsType = "xfs";
};
};
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/22e2d822-7f26-4246-a28e-b10a116f2818"; } {
device = "/dev/disk/by-uuid/22e2d822-7f26-4246-a28e-b10a116f2818";
}
]; ];
boot.initrd.luks.devices."coffee".device = "/dev/disk/by-uuid/e24d653d-df2d-472b-97c3-653ee3169b1c"; boot.initrd.luks.devices."coffee".device = "/dev/disk/by-uuid/e24d653d-df2d-472b-97c3-653ee3169b1c";

View File

@@ -2,4 +2,5 @@
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
} }

View File

@@ -0,0 +1,26 @@
{
inputs,
lib,
...
}:
let
genAttrs' = xs: f: lib.listToAttrs(lib.map f xs);
in {
services.darkman = {
enable = true;
settings = {
lat = 49.0800;
lng = 8.23300;
portal = true;
dbusserver = true;
};
};
home.file = genAttrs' [ "local/share/light-mode.d" "local/share/dark-mode.d" ] (
path:
lib.nameValuePair (".${path}") {
source = lib.concatStringsSep "/" [ inputs.dotfiles path ];
target = ".${path}";
}
);
}

View File

@@ -1,19 +1,12 @@
{ lib, pkgs, ... }: { { lib, pkgs, ... }: {
imports = [ imports = [
./darkman.nix
./git.nix ./git.nix
./gnupg.nix ./gnupg.nix
]; ];
home.stateVersion = "24.11"; home.stateVersion = "24.11";
services.darkman = {
enable = true;
settings = {
lat = 49.0800;
lng = 8.23300;
portal = true;
dbusserver = true;
};
};
xdg.enable = true;
home.preferXdgDirectories = true; home.preferXdgDirectories = true;
programs.firefox = import ./firefox.nix { inherit lib; }; programs.firefox = import ./firefox.nix { inherit lib; };
} }

View File

@@ -1,11 +1,7 @@
{ lib, config, ... }: { inputs, lib, config, ... }:
let let
repo = (builtins.fetchGit { dotfileRepo = inputs.dotfiles;
url = "https://git.finally.coffee/transcaffeine/dotfiles.git";
ref = "main";
shallow = true;
});
utils = import ../../../utils { inherit lib; }; utils = import ../../../utils { inherit lib; };
in { in {
programs.gpg = let programs.gpg = let
@@ -16,7 +12,7 @@ in {
}) ( }) (
builtins.filter (value: value != "") ( builtins.filter (value: value != "") (
lib.splitString "\n" ( lib.splitString "\n" (
lib.readFile (repo.outPath + "/config/gnupg/gpg.conf") lib.readFile (dotfileRepo + "/config/gnupg/gpg.conf")
) )
) )
) )
@@ -36,7 +32,7 @@ in {
}) ( }) (
builtins.filter (v: v != "") ( builtins.filter (v: v != "") (
lib.splitString "\n" ( lib.splitString "\n" (
lib.readFile (repo.outPath + "/config/gnupg/gpg-agent.conf") lib.readFile (dotfileRepo.outPath + "/config/gnupg/gpg-agent.conf")
) )
) )
) )