formatting
This commit is contained in:
parent
64fcff10aa
commit
48387d08e3
14 changed files with 129 additions and 111 deletions
|
|
@ -1,12 +1,14 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
|
|
@ -138,5 +140,4 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = "prunebutt";
|
||||
|
|
@ -42,7 +44,6 @@
|
|||
programs.neovim.enable = true;
|
||||
programs.neovim.defaultEditor = true;
|
||||
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
home.file = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,15 @@
|
|||
{ config, pkgs, lib, inputs, outputs, system, helperLib, ... }: {
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
system,
|
||||
helperLib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
outputs.nixosModules.default
|
||||
];
|
||||
|
|
@ -25,7 +34,6 @@
|
|||
|
||||
programs.ssh.askPassword = lib.mkForce "${pkgs.kdePackages.ksshaskpass.out}/bin/ksshaskpass";
|
||||
|
||||
|
||||
myNixOS = {
|
||||
bundles.general-desktop.enable = true;
|
||||
|
||||
|
|
@ -67,7 +75,6 @@
|
|||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
hardware.nvidia = {
|
||||
|
||||
# Modesetting is required.
|
||||
modesetting.enable = true;
|
||||
|
||||
|
|
@ -122,5 +129,4 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
|
|
@ -13,16 +17,16 @@
|
|||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c849b1d0-f6b0-414b-a2f8-15add0b2b637";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c849b1d0-f6b0-414b-a2f8-15add0b2b637";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@"];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-2875a668-8d20-46b1-9c37-843c250be560".device = "/dev/disk/by-uuid/2875a668-8d20-46b1-9c37-843c250be560";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/4D76-7705";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/4D76-7705";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# home.username = "prunebutt";
|
||||
# home.homeDirectory = "/home/prunebutt";
|
||||
home = let
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
];
|
||||
|
||||
nixpkgs.config = {
|
||||
|
|
@ -51,7 +50,6 @@
|
|||
EDITOR = "nvim";
|
||||
};
|
||||
|
||||
# programs.neovim.enable = true;
|
||||
# programs.neovim.defaultEditor = true;
|
||||
programs.nixvim.enable = true;
|
||||
programs.neovim.enable = true;
|
||||
programs.neovim.defaultEditor = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,5 +11,7 @@
|
|||
inkscape-with-extensions
|
||||
gimp
|
||||
krita
|
||||
|
||||
xournalpp
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,13 +31,12 @@
|
|||
configExtension = config: (lib.mkIf cfg.bundles.${name}.enable config);
|
||||
})
|
||||
(helperLib.filesIn ./bundles);
|
||||
|
||||
in {
|
||||
imports = [
|
||||
imports =
|
||||
[
|
||||
]
|
||||
# ++ features
|
||||
++ bundles
|
||||
;
|
||||
++ bundles;
|
||||
|
||||
config = {
|
||||
myHomeManager = {
|
||||
|
|
|
|||
|
|
@ -34,4 +34,3 @@ in {
|
|||
sops
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,8 +51,7 @@ in {
|
|||
]
|
||||
++ features
|
||||
++ bundles
|
||||
++ services
|
||||
;
|
||||
++ services;
|
||||
|
||||
options.myNixOS = {
|
||||
sharedSettings = {
|
||||
|
|
@ -68,7 +67,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
config = {
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
programs.nix-ld.enable = true;
|
||||
|
|
@ -81,7 +79,6 @@ in {
|
|||
defaultLocale.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
# imports = [
|
||||
# ./neo.nix
|
||||
|
|
@ -95,3 +92,4 @@ in {
|
|||
# pipewire.enable = lib.mkDefault true;
|
||||
# pipewire.useJack = lib.mkDefault false;
|
||||
# }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, config, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
time.timeZone = lib.mkDefault "Europe/Berlin";
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,10 @@
|
|||
label = "KeepassXC";
|
||||
id = "xd4de-mjfcq";
|
||||
devices = ["littleUmbrella" "pixelRoot" "pixelDefault" "pixelGooglor" "saintAlphonso"];
|
||||
versioning = { type = "simple"; params.keep = "5"; };
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "5";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue