Format nix files with nix-fmt
This commit is contained in:
parent
25a48b5694
commit
53c956d53e
10 changed files with 149 additions and 163 deletions
120
common.nix
120
common.nix
|
|
@ -1,76 +1,76 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./gpg.nix
|
||||
./users/functionalhacker/configuration.nix
|
||||
./users/som/configuration.nix
|
||||
];
|
||||
imports = [
|
||||
./gpg.nix
|
||||
./users/functionalhacker/configuration.nix
|
||||
./users/som/configuration.nix
|
||||
];
|
||||
|
||||
system.stateVersion = "24.05";
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
system.stateVersion = "24.05";
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
time.timeZone = "Europe/Helsinki";
|
||||
time.timeZone = "Europe/Helsinki";
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = "fi_FI.UTF-8";
|
||||
LC_IDENTIFICATION = "fi_FI.UTF-8";
|
||||
LC_MEASUREMENT = "fi_FI.UTF-8";
|
||||
LC_MONETARY = "fi_FI.UTF-8";
|
||||
LC_NAME = "fi_FI.UTF-8";
|
||||
LC_NUMERIC = "fi_FI.UTF-8";
|
||||
LC_PAPER = "fi_FI.UTF-8";
|
||||
LC_TELEPHONE = "fi_FI.UTF-8";
|
||||
LC_TIME = "fi_FI.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = "fi_FI.UTF-8";
|
||||
LC_IDENTIFICATION = "fi_FI.UTF-8";
|
||||
LC_MEASUREMENT = "fi_FI.UTF-8";
|
||||
LC_MONETARY = "fi_FI.UTF-8";
|
||||
LC_NAME = "fi_FI.UTF-8";
|
||||
LC_NUMERIC = "fi_FI.UTF-8";
|
||||
LC_PAPER = "fi_FI.UTF-8";
|
||||
LC_TELEPHONE = "fi_FI.UTF-8";
|
||||
LC_TIME = "fi_FI.UTF-8";
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
|
||||
xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
|
||||
xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
};
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
hardware.pulseaudio.enable = false;
|
||||
|
||||
security.rtkit.enable = true;
|
||||
security.rtkit.enable = true;
|
||||
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
nativeMessagingHosts.packages = [ pkgs.browserpass ];
|
||||
};
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
nativeMessagingHosts.packages = [ pkgs.browserpass ];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
gnumake
|
||||
home-manager
|
||||
neovim
|
||||
telegram-desktop
|
||||
usbutils
|
||||
wl-clipboard
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
gnumake
|
||||
home-manager
|
||||
neovim
|
||||
telegram-desktop
|
||||
usbutils
|
||||
wl-clipboard
|
||||
];
|
||||
}
|
||||
|
|
|
|||
55
flake.nix
55
flake.nix
|
|
@ -1,34 +1,35 @@
|
|||
{
|
||||
description = "FunctionalHacker's NixOS config";
|
||||
description = "FunctionalHacker's NixOS config";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ... }:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations.Mirkwood = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./common.nix
|
||||
./hosts/Mirkwood/configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, ...}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in {
|
||||
nixosConfigurations.Mirkwood = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
./common.nix
|
||||
./hosts/Mirkwood/configuration.nix
|
||||
];
|
||||
};
|
||||
|
||||
homeConfigurations = {
|
||||
functionalhacker = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./users/functionalhacker/home.nix ];
|
||||
};
|
||||
};
|
||||
homeConfigurations = {
|
||||
functionalhacker = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./users/functionalhacker/home.nix ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
36
gpg.nix
36
gpg.nix
|
|
@ -1,24 +1,24 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs = {
|
||||
ssh.startAgent = false;
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
};
|
||||
programs = {
|
||||
ssh.startAgent = false;
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
pcscd.enable = true;
|
||||
udev.packages = [
|
||||
pkgs.yubikey-personalization
|
||||
];
|
||||
};
|
||||
services = {
|
||||
pcscd.enable = true;
|
||||
udev.packages = [
|
||||
pkgs.yubikey-personalization
|
||||
];
|
||||
};
|
||||
|
||||
environment.shellInit = ''
|
||||
gpg-connect-agent /bye
|
||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||
export MARKON_MUUTTUJA="test"
|
||||
'';
|
||||
environment.shellInit = ''
|
||||
gpg-connect-agent /bye
|
||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||
export MARKON_MUUTTUJA="test"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,4 @@
|
|||
{
|
||||
"bash-language-server": "5.4.0",
|
||||
"css-lsp": "4.10.0",
|
||||
"docker-compose-language-service": "0.2.0",
|
||||
"dockerfile-language-server": "0.13.0",
|
||||
"eslint-lsp": "4.10.0",
|
||||
"google-java-format": "v1.23.0",
|
||||
"html-lsp": "4.10.0",
|
||||
"java-debug-adapter": "0.58.0",
|
||||
"jdtls": "v1.38.0",
|
||||
"json-lsp": "4.10.0",
|
||||
"lemminx": "0.27.1",
|
||||
"lua-language-server": "3.10.5",
|
||||
"prettier": "3.3.3",
|
||||
"prettierd": "0.25.3",
|
||||
"stylua": "v0.20.0",
|
||||
"taplo": "0.9.3",
|
||||
"tree-sitter-cli": "v0.22.6",
|
||||
"typescript-language-server": "4.3.3",
|
||||
"yaml-language-server": "1.15.0"
|
||||
}
|
||||
"nil": "2024-08-06",
|
||||
"nixpkgs-fmt": "1.3.0"
|
||||
}
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../wifi.nix
|
||||
./hardware-configuration.nix
|
||||
../../wifi.nix
|
||||
];
|
||||
|
||||
networking.hostName = "Mirkwood";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
||||
|
|
@ -14,21 +15,22 @@
|
|||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/fcb4b991-0704-45c0-9d31-bd858e1476aa";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/fcb4b991-0704-45c0-9d31-bd858e1476aa";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-2d20d058-3ea8-41cf-90fa-872f46960add".device = "/dev/disk/by-uuid/2d20d058-3ea8-41cf-90fa-872f46960add";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/8498-FFAF";
|
||||
{
|
||||
device = "/dev/disk/by-uuid/8498-FFAF";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/dba8a94b-d7b6-4ac1-a0bb-82d6538ff331"; }
|
||||
];
|
||||
[{ device = "/dev/disk/by-uuid/dba8a94b-d7b6-4ac1-a0bb-82d6538ff331"; }];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
users.users.functionalhacker = {
|
||||
description = "Marko";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
description = "Marko";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
|
||||
home = {
|
||||
username = "functionalhacker";
|
||||
homeDirectory = "/home/functionalhacker";
|
||||
stateVersion = "24.05";
|
||||
home = {
|
||||
username = "functionalhacker";
|
||||
homeDirectory = "/home/functionalhacker";
|
||||
stateVersion = "24.05";
|
||||
|
||||
file.".config/nvim".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/dotfiles/home/.config/nvim";
|
||||
file.".config/nvim".source =
|
||||
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/git/dotfiles/home/.config/nvim";
|
||||
|
||||
packages = with pkgs; [
|
||||
cargo
|
||||
fzf
|
||||
gcc
|
||||
nerdfonts
|
||||
nodejs
|
||||
pass
|
||||
tree-sitter
|
||||
yarn
|
||||
zsh
|
||||
];
|
||||
};
|
||||
packages = with pkgs; [
|
||||
cargo
|
||||
fzf
|
||||
gcc
|
||||
nerdfonts
|
||||
nodejs
|
||||
pass
|
||||
tree-sitter
|
||||
yarn
|
||||
zsh
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
{
|
||||
users.users.som = {
|
||||
description = "Som";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" ];
|
||||
description = "Som";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
6
wifi.nix
6
wifi.nix
|
|
@ -1,8 +1,8 @@
|
|||
{...}:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
networking = {
|
||||
networkmanager.wifi.backend = "iwd";
|
||||
wireless.iwd.enable = true;
|
||||
networkmanager.wifi.backend = "iwd";
|
||||
wireless.iwd.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue