working flake

This commit is contained in:
Theo Hahn committed 2026-09-20 14:25:56 +02:00
1 parent c4d1a0d8cb
commit 6741cf73c4
6 files changed
+72 -37

No files matched your search

+3 -5
View File
@@ -50,11 +50,9 @@ local menu = "hyprlauncher"
-- Autostart necessary processes (like notifications daemons, status bars, etc.) -- Autostart necessary processes (like notifications daemons, status bars, etc.)
-- Or execute your favorite apps at launch like this: -- Or execute your favorite apps at launch like this:
-- --
-- hl.on("hyprland.start", function () hl.on("hyprland.start", function ()
-- hl.exec_cmd(terminal) hl.exec_cmd("ashell")
-- hl.exec_cmd("nm-applet") end)
-- hl.exec_cmd("waybar & hyprpaper & firefox")
-- end)
------------------------------- -------------------------------
+16 -16
View File
@@ -8,7 +8,7 @@
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
"${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/apple/t2" # "${builtins.fetchGit { url = "https://github.com/NixOS/nixos-hardware.git"; }}/apple/t2"
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@@ -19,18 +19,23 @@
networking.hostName = "tnix"; # Define your hostname. networking.hostName = "tnix"; # Define your hostname.
services.upower.enable = true; services.upower.enable = true;
hardware.firmware = [ nix.settings.experimental-features = [
(pkgs.stdenvNoCC.mkDerivation (final: { "nix-command"
name = "brcm-firmware"; "flakes"
src = "./firmware/brcm";
phases = [ "installPhase" ];
installPhase = ''
mkdir -p $out/lib/firmware/brcm
cp -r ./. "$out/lib/firmware/brcm"
'';
}))
]; ];
# hardware.firmware = [
# (pkgs.stdenvNoCC.mkDerivation (final: {
# name = "brcm-firmware";
# src = "./firmware/brcm";
# phases = [ "installPhase" ];
# installPhase = ''
# mkdir -p $out/lib/firmware/brcm
# cp -r ./. "$out/lib/firmware/brcm"
# '';
# }))
# ];
# Configure network connections interactively with nmcli or nmtui. # Configure network connections interactively with nmcli or nmtui.
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@@ -105,11 +110,6 @@
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
# #
Generated
+42 -11
View File
@@ -7,32 +7,62 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789267039, "lastModified": 1789867870,
"narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=", "narHash": "sha256-sOag/7DTqw4tXLI7UxjrZxPGV+dlTe6zFtJn0VSkgFM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec172013fa62135f58fb58dd17ae9651e8f39727", "rev": "d2a22a3659a6ae99847ea9176114f6957b8ac62e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1789752250,
"narHash": "sha256-q0J27mJDfd4BM9a7KcMVbcRmqyU+goQwudbMIu66qsg=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "b2d7d02644f0002535a3bb51a73780945cdc7ba4",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1789749394, "lastModified": 1789546076,
"narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=", "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
"owner": "nixos", "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
},
"original": {
"type": "tarball",
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49", "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-26.05", "ref": "567a49d",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -40,7 +70,8 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2"
} }
} }
}, },
+7 -3
View File
@@ -2,19 +2,23 @@
description = "tNixOS configuration"; description = "tNixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs.url = "github:NixOS/nixpkgs/567a49d";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:nixos/nixos-hardware";
}; };
outputs = inputs@{ nixpkgs, home-manager, ... }: { outputs = inputs@{ nixpkgs, home-manager, nixos-hardware, ... }: {
nixosConfigurations = { nixosConfigurations = {
tnix = nixpkgs.lib.nixosSystem { tnix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
nixos-hardware.nixosModules.apple-t2
./home.nix ./home.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
+3 -1
View File
@@ -21,10 +21,12 @@
ashell ashell
kitty kitty
hyprlauncher hyprlauncher
nil
]; ];
programs.bash.enable = true; programs.bash.enable = true;
home.stateVersion = "26.05"; home.stateVersion = "26.11";
}; };
} }
+1 -1
View File
@@ -6,7 +6,7 @@ install:
sudo nixos-install sudo nixos-install
rebuild: rebuild:
sudo nixos-rebuild switch --flake .#tnix --impure sudo nixos-rebuild switch --flake .#tnix
setup: setup:
ln -sf ~/tnixos/config/hypr ~/.config/hypr ln -sf ~/tnixos/config/hypr ~/.config/hypr