Compare commits

..

12 Commits

8 changed files with 137 additions and 77 deletions

111
flake.lock generated
View File

@@ -1,15 +1,34 @@
{ {
"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" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1753592768, "lastModified": 1756679287,
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc3add429f21450359369af74c2375cb34a2d204", "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -21,11 +40,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1754564048, "lastModified": 1757103352,
"narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "rev": "11b2a10c7be726321bb854403fdeec391e798bf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,57 +55,69 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1753345091, "lastModified": 1760105160,
"narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "narHash": "sha256-oYYalpFIVeDolg/zpkPkKk8mBuvnj/lUE3/K7OuTOwk=",
"owner": "NixOS", "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.810995.5da4a26309e7/nixexprs.tar.xz"
},
"original": {
"type": "tarball",
"url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
}
},
"nixpkgs-forked": {
"locked": {
"lastModified": 1751998018,
"narHash": "sha256-JHVI60B3/cN3a0JDfslramsO056ig5wMQTGmgO9eLWQ=",
"owner": "transcaffeine",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "rev": "5d91ff97e777cd2bfb8cb108907e49abcea939f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "transcaffeine",
"ref": "nixos-25.05", "ref": "nexus/3.81.1",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-local": {
"locked": {
"lastModified": 1757168979,
"narHash": "sha256-abp5DZtyu8idvMbPbEpBfdsxmhnNo/ud8hZ0KsbvAqs=",
"ref": "refs/heads/cinny/4.9.1",
"rev": "fc2627665df4f815f2409effcaf7bb0f427e303c",
"revCount": 855244,
"type": "git",
"url": "file:/home/transcaffeine/git/transcaffeine/nixpkgs"
},
"original": {
"type": "git",
"url": "file:/home/transcaffeine/git/transcaffeine/nixpkgs"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1755186698, "lastModified": 1760252326,
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "narHash": "sha256-5v32B25kSE++E+KtP4DO687r/AlWL9qOlOjtYyfcDSw=",
"owner": "NixOS", "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b",
"repo": "nixpkgs", "type": "tarball",
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre876242.66e5020bfe0a/nixexprs.tar.xz"
"type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "type": "tarball",
"ref": "nixos-unstable", "url": "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz"
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1755078291,
"narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"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_2", "nixpkgs": "nixpkgs",
"nixpkgs-forked": "nixpkgs-forked",
"nixpkgs-local": "nixpkgs-local",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }

View File

@@ -1,11 +1,20 @@
{ {
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/nixos-unstable"; nixpkgs-unstable.url = "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.xz";
# nixpkgs-unstable.url = "github:transcaffeine/nixpkgs/nexus/3.81.1"; nixpkgs-forked.url = "github:transcaffeine/nixpkgs/nexus/3.81.1";
# nixpkgs-unstable.url = "git+file:/home/transcaffeine/git/transcaffeine/nixpkgs"; nixpkgs-local = {
home-manager.url = "github:nix-community/home-manager/release-25.05"; url = "git+file:/home/transcaffeine/git/transcaffeine/nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
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

@@ -4,11 +4,4 @@
./configuration.nix ./configuration.nix
../../profiles/base ../../profiles/base
]; ];
nixpkgs.config.permittedInsecurePackages = [
"nexus-3.70.1-02"
];
services.nexus = {
enable = true;
package = pkgs.nexus3;
};
} }

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")
) )
) )
) )