add boot fix and wallpapers
This commit is contained in:
parent
622d60963d
commit
9d35632510
@ -1,36 +1,54 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ ];
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/9fa87bdc-c4ee-40c7-ae65-ad7f2e1bd026";
|
device = "/dev/disk/by-uuid/9fa87bdc-c4ee-40c7-ae65-ad7f2e1bd026";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-bc22cfc0-ff2e-4803-82b6-dae1bc1927f4".device = "/dev/disk/by-uuid/bc22cfc0-ff2e-4803-82b6-dae1bc1927f4";
|
boot.initrd.luks.devices."luks-bc22cfc0-ff2e-4803-82b6-dae1bc1927f4".device =
|
||||||
|
"/dev/disk/by-uuid/bc22cfc0-ff2e-4803-82b6-dae1bc1927f4";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/7D27-F64C";
|
device = "/dev/disk/by-uuid/7D27-F64C";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
};
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
boot.initrd.luks.devices."luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2".device = "/dev/disk/by-uuid/ef3250cd-9b9f-4971-b2f3-f597ee4db2e2";
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/mapper/luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# encrypted swap
|
||||||
|
boot.initrd.luks.devices."luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2".device =
|
||||||
|
"/dev/disk/by-uuid/ef3250cd-9b9f-4971-b2f3-f597ee4db2e2";
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/mapper/luks-ef3250cd-9b9f-4971-b2f3-f597ee4db2e2"; }
|
||||||
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|||||||
@ -380,5 +380,5 @@ binds {
|
|||||||
|
|
||||||
switch-events {
|
switch-events {
|
||||||
lid-close { spawn "systemctl" "suspend"; }
|
lid-close { spawn "systemctl" "suspend"; }
|
||||||
lid-open { spawn "notify-send" "The laptop lid is open!"; }
|
// lid-open { spawn "notify-send" "The laptop lid is open!"; }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -112,6 +112,23 @@ in
|
|||||||
else
|
else
|
||||||
{ }
|
{ }
|
||||||
)
|
)
|
||||||
|
# wallpapers
|
||||||
|
(
|
||||||
|
let
|
||||||
|
wallpapersPath = ./wallpapers;
|
||||||
|
in
|
||||||
|
if builtins.pathExists wallpapersPath then
|
||||||
|
builtins.listToAttrs (
|
||||||
|
map (name: {
|
||||||
|
name = "Pictures/Wallpapers/${name}";
|
||||||
|
value = {
|
||||||
|
source = wallpapersPath + "/${name}";
|
||||||
|
};
|
||||||
|
}) (builtins.attrNames (builtins.readDir wallpapersPath))
|
||||||
|
)
|
||||||
|
else
|
||||||
|
{ }
|
||||||
|
)
|
||||||
{
|
{
|
||||||
".face".source = ./face.png;
|
".face".source = ./face.png;
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
jaci/modules/home-manager/wallpapers/kiki-and-boy.png
Normal file
BIN
jaci/modules/home-manager/wallpapers/kiki-and-boy.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 613 KiB |
BIN
jaci/modules/home-manager/wallpapers/kiki-jiji.png
Normal file
BIN
jaci/modules/home-manager/wallpapers/kiki-jiji.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 MiB |
BIN
jaci/modules/home-manager/wallpapers/kiki-sky.jpg
Normal file
BIN
jaci/modules/home-manager/wallpapers/kiki-sky.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 443 KiB |
|
Before Width: | Height: | Size: 162 KiB After Width: | Height: | Size: 162 KiB |
@ -1,38 +1,52 @@
|
|||||||
# Do not modify this file! It was generated by 'nixos-generate-config'
|
# Do not modify this file! It was generated by 'nixos-generate-config'
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
#
|
{
|
||||||
# NOTE: This file is a template for Framework 12 Intel hardware.
|
config,
|
||||||
# The disk UUIDs below are placeholders and need to be updated after
|
lib,
|
||||||
# running nixos-generate-config on the actual hardware.
|
pkgs,
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports = [
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [
|
||||||
boot.initrd.kernelModules = [ ];
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usbhid"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/9e7135ed-b924-455b-9fdf-3c9b324fea52";
|
device = "/dev/disk/by-uuid/9e7135ed-b924-455b-9fdf-3c9b324fea52";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."luks-3e44caf1-e83f-452e-80c9-fdd75d35b237".device = "/dev/disk/by-uuid/3e44caf1-e83f-452e-80c9-fdd75d35b237";
|
boot.initrd.luks.devices."luks-3e44caf1-e83f-452e-80c9-fdd75d35b237".device =
|
||||||
|
"/dev/disk/by-uuid/3e44caf1-e83f-452e-80c9-fdd75d35b237";
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/8350-826A";
|
device = "/dev/disk/by-uuid/8350-826A";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [
|
||||||
};
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/aa923d84-bc16-40d9-a100-113bb31c761d"; }
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# encrypted swap
|
||||||
|
boot.initrd.luks.devices."luks-a62778ac-3b3c-4eae-8713-1ab83f585608".device =
|
||||||
|
"/dev/disk/by-uuid/a62778ac-3b3c-4eae-8713-1ab83f585608";
|
||||||
|
|
||||||
|
swapDevices = [ { device = "/dev/mapper/luks-a62778ac-3b3c-4eae-8713-1ab83f585608"; } ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# 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
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|||||||
@ -424,6 +424,6 @@ binds {
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch-events {
|
switch-events {
|
||||||
lid-close { spawn "systemctl" "suspend"; }
|
// lid-close { spawn "systemctl" "suspend"; }
|
||||||
lid-open { spawn "notify-send" "The laptop lid is open!"; }
|
// lid-open { spawn "notify-send" "The laptop lid is open!"; }
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user