m3tam3re/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake update

Browse Source
This commit is contained in:
Sascha Koenig 2025-05-19 14:39:49 +02:00
parent 68ecbd3bf1
commit 22cbc7c5a2
8 changed files with 86 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
flake.lock generated
View File

@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1745630506, "lastModified": 1747575206,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded", "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -94,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746729224, "lastModified": 1747621015,
"narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "narHash": "sha256-j0fo1rNxZvmFLMaE945UrbLJZAHTlQmq0/QMgOP4GTs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "85555d27ded84604ad6657ecca255a03fd878607", "rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747021744, "lastModified": 1747565775,
"narHash": "sha256-IDsM/9/tHQBlhG3tXI2fTM84AUN1uRa7JDPT1LMlGes=", "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fb061f555f821fe4fb49f8f6f2a0cc3d5728bd52", "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1747029715, "lastModified": 1747531721,
"narHash": "sha256-F75IlhzUF+VTPOq+u2Exj+6PjHWPkLcBWDnhO+Vvch4=", "narHash": "sha256-kx7hCuML0sMcjbyjbpplNWsJjLoUfiy23JiS9aG4UWw=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "HyprPanel", "repo": "HyprPanel",
"rev": "2bb1449fb6ad60a736ce6fb4de2037d7655545ed", "rev": "c203ffe80f4e7b68e22ba3fde0598622500f5add",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,9 +223,7 @@
"nixos-generators": { "nixos-generators": {
"inputs": { "inputs": {
"nixlib": "nixlib", "nixlib": "nixlib",
"nixpkgs": [ "nixpkgs": "nixpkgs_3"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1742568034, "lastModified": 1742568034,
@ -257,19 +255,19 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-9e9486b": { "nixpkgs-9472de4": {
"locked": { "locked": {
"lastModified": 1744046669, "lastModified": 1738854639,
"narHash": "sha256-7PIbZBxiHW9pRKswRKrrvY0oZ0+3avDJktbLCJQTNao=", "narHash": "sha256-P6CUfI32vWOhNcOPoQQCdQihqEX8baa6SeMET/Ivimc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e9486ba0142e24a6be35a12384a42982c65d963", "rev": "9472de43946f312ab6c82ea25c416217c025c3db",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e9486ba0142e24a6be35a12384a42982c65d963", "rev": "9472de43946f312ab6c82ea25c416217c025c3db",
"type": "github" "type": "github"
} }
}, },
@ -291,11 +289,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1747413287, "lastModified": 1747661101,
"narHash": "sha256-hOnqJr0tZBERWa29JWf9B3/8qr82mlt/UlKPvS7iYzA=", "narHash": "sha256-vufYvOxdM1TDm8Ak+sxl+rnKOlJpnWkNsau7CjqGrhI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b965e4c283060415956ccd39eee4ca34a6a56cf8", "rev": "3fb9306f40ae09b4ddcd0ab4be2ed40e20b61b2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +305,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746810718, "lastModified": 1747485343,
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +337,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1746904237, "lastModified": 1736657626,
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1747542820,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,7 +367,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@ -377,8 +391,8 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprpanel": "hyprpanel", "hyprpanel": "hyprpanel",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-9e9486b": "nixpkgs-9e9486b", "nixpkgs-9472de4": "nixpkgs-9472de4",
"nixpkgs-locked": "nixpkgs-locked", "nixpkgs-locked": "nixpkgs-locked",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
@ -388,7 +402,7 @@
"rose-pine-hyprcursor": { "rose-pine-hyprcursor": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_5",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {

14
flake.nix
View File

@ -17,7 +17,7 @@
}; };
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-9e9486b.url = "github:nixos/nixpkgs/9e9486ba0142e24a6be35a12384a42982c65d963"; nixpkgs-9472de4.url = "github:nixos/nixpkgs/9472de43946f312ab6c82ea25c416217c025c3db";
nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121"; nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
@ -30,7 +30,6 @@
nixos-generators = { nixos-generators = {
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
@ -142,16 +141,5 @@
echo " - tofu apply" echo " - tofu apply"
''; '';
}; };
homeConfigurations = {
"m3tam3re@m3-ares" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."x86_64-linux";
extraSpecialArgs = {
inherit inputs outputs;
hostname = "m3-ares";
};
modules = [./home/m3tam3re/m3tam3re-ares.nix];
};
};
}; };
} }

3
home/features/cli/nushell.nix
View File

@ -12,9 +12,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nushell = { programs.nushell = {
enable = true; enable = true;
plugins = with pkgs.nushellPlugins; [
skim
];
envFile.text = '' envFile.text = ''
$env.config.show_banner = false $env.config.show_banner = false
$env.NIX_PATH = "nixpkgs=channel:nixos-unstable" $env.NIX_PATH = "nixpkgs=channel:nixos-unstable"

2
home/features/desktop/default.nix
View File

@ -72,7 +72,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
appimage-run appimage-run
temp.anytype anytype
# blueberry # blueberry
brave brave
# brightnessctl # brightnessctl

3
hosts/common/extraServices/virtualisation.nix
View File

@ -31,5 +31,8 @@ in {
}; };
}; };
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
environment = {
systemPackages = [pkgs.qemu];
};
}; };
} }

42
hosts/m3-hermes/default.nix
View File

@ -11,8 +11,39 @@
enable = true; enable = true;
network.enable = true; network.enable = true;
settings = { settings = {
system_info.distro = "nixos"; system_info = {
datasource_list = ["NoCloud" "ConfigDrive"]; distro = "nixos";
network = {
renderers = ["networkd"];
};
default_user = {
name = "ops";
};
};
users = ["default"];
ssh_pwauth = false;
chpasswd = {
expire = false;
};
cloud_init_modules = [
"migrator"
"seed_random"
"growpart"
"resizefs"
];
cloud_config_modules = [
"disk_setup"
"mounts"
"set-passwords"
"ssh"
];
cloud_final_modules = [];
}; };
}; };
@ -20,10 +51,6 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = {
PermitRootLogin = "prohibit-password";
PasswordAuthentication = false;
};
}; };
networking = { networking = {
@ -39,7 +66,4 @@
# Bootloader # Bootloader
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";
# Enable QEMU guest agent
services.qemuGuest.enable = true;
} }

3
hosts/m3-kratos/services/udev.nix
View File

@ -1,7 +1,4 @@
{pkgs, ...}: { {pkgs, ...}: {
services.udev.extraRules = ''
SUBSYSTEM=="usb", MODE="0666
'';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
zsa-udev-rules zsa-udev-rules
]; ];

3
overlays/default.nix
View File

@ -14,7 +14,6 @@
commandLineArgs = "--password-store=gnome-libsecret"; commandLineArgs = "--password-store=gnome-libsecret";
}; };
nushell = inputs.nixpkgs-9e9486b.legacyPackages.${prev.system}.nushell;
# OVMF = inputs.nixpkgs-locked.legacyPackages.${prev.system}.OVMF; # OVMF = inputs.nixpkgs-locked.legacyPackages.${prev.system}.OVMF;
# trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord; # trezord = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.trezord;
mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa; mesa = inputs.nixpkgs-master.legacyPackages.${prev.system}.mesa;
@ -44,7 +43,7 @@
}; };
pinned-packages = final: _prev: { pinned-packages = final: _prev: {
pinned = import inputs.nixpkgs-9e9486b { pinned = import inputs.nixpkgs-9472de4 {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };