Compare commits
4 commits
d05dafe487
...
647c6cb036
Author | SHA1 | Date | |
---|---|---|---|
647c6cb036 | |||
738ad536b5 | |||
a86db73383 | |||
22a16a6403 |
8 changed files with 1211 additions and 45 deletions
|
@ -7,6 +7,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
users.users.ash.extraGroups = [ "networkmanager" ];
|
||||||
|
|
||||||
time.timeZone = "Europe/London";
|
time.timeZone = "Europe/London";
|
||||||
i18n.defaultLocale = "en_GB.utf8";
|
i18n.defaultLocale = "en_GB.utf8";
|
||||||
|
|
1190
flake.lock
1190
flake.lock
File diff suppressed because it is too large
Load diff
37
flake.nix
37
flake.nix
|
@ -8,8 +8,14 @@
|
||||||
url = "github:NixOS/nixpkgs/nixos-unstable";
|
url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-zed = {
|
lix-module-stable = {
|
||||||
url = "github:GaetanLepage/nixpkgs/zed";
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-stable";
|
||||||
|
};
|
||||||
|
|
||||||
|
lix-module-unstable = {
|
||||||
|
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
home-manager-stable = {
|
home-manager-stable = {
|
||||||
|
@ -38,20 +44,31 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
|
|
||||||
|
niri-flake = {
|
||||||
|
url = "github:sodiboo/niri-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
inputs.nixpkgs-stable.follows = "nixpkgs-stable";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs-stable, nixpkgs-unstable, nixpkgs-zed, fsh, home-manager-stable, home-manager-unstable, nixos-generators, vscode-extensions, agenix, ... }:
|
outputs = {
|
||||||
|
self,
|
||||||
|
nixpkgs-stable, nixpkgs-unstable,
|
||||||
|
lix-module-stable, lix-module-unstable,
|
||||||
|
home-manager-stable, home-manager-unstable,
|
||||||
|
nixos-generators,
|
||||||
|
fsh,
|
||||||
|
vscode-extensions,
|
||||||
|
agenix,
|
||||||
|
niri-flake,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
home-manager = home-manager-unstable;
|
home-manager = home-manager-unstable;
|
||||||
zed-overlay = final: prev: {
|
|
||||||
# Inherit the changes into the overlay
|
|
||||||
inherit (nixpkgs-zed.legacyPackages.${prev.system})
|
|
||||||
zed-editor;
|
|
||||||
};
|
|
||||||
overlays = [
|
overlays = [
|
||||||
fsh.overlays.default
|
fsh.overlays.default
|
||||||
vscode-extensions.overlays.default
|
vscode-extensions.overlays.default
|
||||||
zed-overlay
|
|
||||||
];
|
];
|
||||||
overlays-module = ({ nixpkgs, ... }: {
|
overlays-module = ({ nixpkgs, ... }: {
|
||||||
nixpkgs.overlays = overlays;
|
nixpkgs.overlays = overlays;
|
||||||
|
@ -108,8 +125,10 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
overlays-module
|
overlays-module
|
||||||
|
niri-flake.nixosModules.niri
|
||||||
./hosts/loona/configuration.nix
|
./hosts/loona/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
lix-module-unstable.nixosModules.default
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
5
home/ash/niri.nix
Normal file
5
home/ash/niri.nix
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
{ config, pkgs, ... }: {
|
||||||
|
programs.niri = {
|
||||||
|
# enable = true;
|
||||||
|
};
|
||||||
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
vscode = vscodium;
|
vscode = vscodium;
|
||||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||||
ms-python.python
|
ms-python.python
|
||||||
|
ms-python.debugpy
|
||||||
ms-vscode.hexeditor
|
ms-vscode.hexeditor
|
||||||
ms-dotnettools.csharp
|
ms-dotnettools.csharp
|
||||||
] ++ (with pkgs.vscode-marketplace; [
|
] ++ (with pkgs.vscode-marketplace; [
|
||||||
|
@ -28,6 +29,9 @@
|
||||||
catppuccin.catppuccin-vsc-icons
|
catppuccin.catppuccin-vsc-icons
|
||||||
ziglang.vscode-zig
|
ziglang.vscode-zig
|
||||||
redhat.java
|
redhat.java
|
||||||
|
vue.volar
|
||||||
|
editorconfig.editorconfig
|
||||||
|
arcanis.vscode-zipfs
|
||||||
]);
|
]);
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
../../common/tailscale.nix
|
../../common/tailscale.nix
|
||||||
../../common/tpm.nix
|
../../common/tpm.nix
|
||||||
../../roles/kodi.nix
|
../../roles/kodi.nix
|
||||||
|
../../roles/libvirt.nix
|
||||||
../../roles/podman.nix
|
../../roles/podman.nix
|
||||||
./hardware-config.nix
|
./hardware-config.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
networking.hostId = "df9469a3";
|
networking.hostId = "df9469a3";
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
sound.enable = true;
|
boot.kernelPackages = pkgs.linuxPackages_6_8;
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
|
|
14
roles/niri.nix
Normal file
14
roles/niri.nix
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{ lib, pkgs, ... }: {
|
||||||
|
services = {
|
||||||
|
xserver = {
|
||||||
|
enable = true;
|
||||||
|
xkb.layout = "gb";
|
||||||
|
};
|
||||||
|
displayManager.sddm = {
|
||||||
|
enable = true;
|
||||||
|
theme = "catppuccin-mocha";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs.niri.enable = true;
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
}
|
Loading…
Reference in a new issue