Compare commits
No commits in common. "a51d4871462455461eeed225c81c73ece5447fbe" and "54acf430c70a686c4d6c384ef8d6de23e28bdeb4" have entirely different histories.
a51d487146
...
54acf430c7
5 changed files with 132 additions and 34 deletions
90
flake.lock
90
flake.lock
|
@ -80,6 +80,40 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1673956053,
|
||||||
|
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1689068808,
|
||||||
|
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -108,11 +142,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1692503956,
|
"lastModified": 1692260837,
|
||||||
"narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=",
|
"narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c",
|
"rev": "6a94c1a59737783c282c4031555a289c28b961e4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -123,11 +157,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1692373088,
|
"lastModified": 1691871742,
|
||||||
"narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=",
|
"narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969",
|
"rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -137,6 +171,28 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-wsl": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1690553050,
|
||||||
|
"narHash": "sha256-pK3kF30OykL3v6P8UP6ipihlS34KoGq9SryCj3tHrFw=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NixOS-WSL",
|
||||||
|
"rev": "f7a95a37306c46b42e9ce751977c44c752fd5eca",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NixOS-WSL",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1671417167,
|
"lastModified": 1671417167,
|
||||||
|
@ -155,11 +211,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1692447944,
|
"lastModified": 1692174805,
|
||||||
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
|
"narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
|
"rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -175,9 +231,25 @@
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
|
"nixos-wsl": "nixos-wsl",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1667395993,
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
url = "github:nixos/nixpkgs/nixos-unstable";
|
url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
};
|
};
|
||||||
|
nixos-wsl = {
|
||||||
|
url = "github:nix-community/NixOS-WSL";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
@ -20,6 +24,7 @@
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
|
, nixos-wsl
|
||||||
, home-manager
|
, home-manager
|
||||||
, agenix
|
, agenix
|
||||||
, nixos-hardware
|
, nixos-hardware
|
||||||
|
@ -49,6 +54,8 @@
|
||||||
|
|
||||||
# Host-specific config
|
# Host-specific config
|
||||||
./hosts/hermes/configuration.nix
|
./hosts/hermes/configuration.nix
|
||||||
|
# nixos-wsl.nixosModules.wsl
|
||||||
|
# ./hosts/hermes/wsl.nix
|
||||||
./hosts/hermes/syncthing.nix
|
./hosts/hermes/syncthing.nix
|
||||||
# ./hosts/hermes/backup.nix
|
# ./hosts/hermes/backup.nix
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs, modulesPath, ... }:
|
{ pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [ ./hardware-configuration.nix ];
|
imports = [ ./hardware-configuration.nix ];
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
@ -9,7 +10,7 @@
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "hermes";
|
hostName = "hermes";
|
||||||
networkmanager.enable = true;
|
|
||||||
hosts = {
|
hosts = {
|
||||||
"192.168.0.7" = [ "bebop" ];
|
"192.168.0.7" = [ "bebop" ];
|
||||||
"192.168.0.164" = [ "titan" ];
|
"192.168.0.164" = [ "titan" ];
|
||||||
|
@ -25,37 +26,35 @@
|
||||||
man.enable = true;
|
man.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
boot = {
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
binfmt.emulatedSystems = [ "aarch64-linux" ];
|
|
||||||
|
|
||||||
loader.systemd-boot.enable = true;
|
# ----
|
||||||
loader.efi.canTouchEfiVariables = true;
|
|
||||||
loader.efi.efiSysMountPoint = "/boot/efi";
|
|
||||||
supportedFilesystems = [ "ntfs" ];
|
|
||||||
|
|
||||||
# Setup keyfile
|
# Bootloader.
|
||||||
initrd.secrets = {
|
boot.loader.systemd-boot.enable = true;
|
||||||
"/crypto_keyfile.bin" = null;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
};
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
|
|
||||||
# Enable swap on luks
|
# Setup keyfile
|
||||||
initrd.luks.devices."luks-8271922a-e889-4f04-8e87-07f0bcde890d".device = "/dev/disk/by-uuid/8271922a-e889-4f04-8e87-07f0bcde890d";
|
boot.initrd.secrets = {
|
||||||
initrd.luks.devices."luks-8271922a-e889-4f04-8e87-07f0bcde890d".keyFile = "/crypto_keyfile.bin";
|
"/crypto_keyfile.bin" = null;
|
||||||
|
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable swap on luks
|
||||||
services.xserver.libinput.enable = true;
|
boot.initrd.luks.devices."luks-8271922a-e889-4f04-8e87-07f0bcde890d".device = "/dev/disk/by-uuid/8271922a-e889-4f04-8e87-07f0bcde890d";
|
||||||
services.xserver.libinput.touchpad.naturalScrolling = true;
|
boot.initrd.luks.devices."luks-8271922a-e889-4f04-8e87-07f0bcde890d".keyFile = "/crypto_keyfile.bin";
|
||||||
services.xserver.libinput.touchpad.middleEmulation = true;
|
|
||||||
services.xserver.libinput.touchpad.tapping = true;
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
|
# Enable networking
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
|
@ -63,14 +62,34 @@
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
jack.enable = true;
|
# If you want to use JACK applications, uncomment this
|
||||||
|
#jack.enable = true;
|
||||||
|
|
||||||
|
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||||
|
# no need to redefine it in your config for now)
|
||||||
|
#media-session.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
|
services.xserver.libinput.enable = true;
|
||||||
|
services.xserver.libinput.touchpad.naturalScrolling = true;
|
||||||
|
services.xserver.libinput.touchpad.middleEmulation = true;
|
||||||
|
services.xserver.libinput.touchpad.tapping = true;
|
||||||
|
|
||||||
|
# ----
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
etc = with pkgs; {
|
etc = with pkgs; {
|
||||||
"jdk".source = jdk;
|
"jdk".source = jdk;
|
||||||
"graal".source = graalvm19-ce;
|
"graal".source = graalvm19-ce;
|
||||||
};
|
};
|
||||||
|
variables = {
|
||||||
|
GTK_THEME = [ "Adwaita:dark" ];
|
||||||
|
GDK_DPI_SCALE = [ "1.5" ];
|
||||||
|
GDK_BACKEND = [ "wayland" ];
|
||||||
|
QT_QPA_PLATFORM = [ "wayland" ];
|
||||||
|
SDL_VIDEODRIVER = [ "wayland" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
|
|
@ -107,7 +107,7 @@ in
|
||||||
# Exercism
|
# Exercism
|
||||||
exercism
|
exercism
|
||||||
|
|
||||||
godot3
|
godot
|
||||||
|
|
||||||
hledger
|
hledger
|
||||||
];
|
];
|
||||||
|
|
|
@ -36,7 +36,7 @@ in
|
||||||
devices = {
|
devices = {
|
||||||
hermes = {
|
hermes = {
|
||||||
id =
|
id =
|
||||||
"DCG6TFN-JRO422C-AQWFNDT-CCT7KCX-ZXUL7OG-O5UGEC3-QPF5VWW-RNXU5Q4";
|
"LYFSPF4-L6C24OM-IDYZAUT-5D32FAS-FCHN7FR-CUPWEEE-YOZYBQ3-RL5T5Q6";
|
||||||
name = "hermes";
|
name = "hermes";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in a new issue