diff --git a/frame12/nixos/hardware-configuration.nix b/frame12/nixos/hardware-configuration.nix index 27fdad3..cf7e48d 100644 --- a/frame12/nixos/hardware-configuration.nix +++ b/frame12/nixos/hardware-configuration.nix @@ -1,36 +1,54 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/9fa87bdc-c4ee-40c7-ae65-ad7f2e1bd026"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/9fa87bdc-c4ee-40c7-ae65-ad7f2e1bd026"; + 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" = - { device = "/dev/disk/by-uuid/7D27-F64C"; - fsType = "vfat"; - 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"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7D27-F64C"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + # 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 # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/jaci/linked-dotfiles/niri/config.kdl b/jaci/linked-dotfiles/niri/config.kdl index 6a21b4a..c4fe6c8 100644 --- a/jaci/linked-dotfiles/niri/config.kdl +++ b/jaci/linked-dotfiles/niri/config.kdl @@ -380,5 +380,5 @@ binds { switch-events { 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!"; } } diff --git a/jaci/modules/home-manager/home.nix b/jaci/modules/home-manager/home.nix index 854abcf..35330ed 100644 --- a/jaci/modules/home-manager/home.nix +++ b/jaci/modules/home-manager/home.nix @@ -112,6 +112,23 @@ in 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; } diff --git a/jaci/modules/home-manager/wallpapers/kiki-and-boy.png b/jaci/modules/home-manager/wallpapers/kiki-and-boy.png new file mode 100644 index 0000000..416a9c1 Binary files /dev/null and b/jaci/modules/home-manager/wallpapers/kiki-and-boy.png differ diff --git a/jaci/modules/home-manager/wallpapers/kiki-jiji.png b/jaci/modules/home-manager/wallpapers/kiki-jiji.png new file mode 100644 index 0000000..49a8f95 Binary files /dev/null and b/jaci/modules/home-manager/wallpapers/kiki-jiji.png differ diff --git a/jaci/modules/home-manager/wallpapers/kiki-sky.jpg b/jaci/modules/home-manager/wallpapers/kiki-sky.jpg new file mode 100644 index 0000000..51e379e Binary files /dev/null and b/jaci/modules/home-manager/wallpapers/kiki-sky.jpg differ diff --git a/jaci/kiki_background.jpg b/jaci/modules/home-manager/wallpapers/kiki_background.jpg similarity index 100% rename from jaci/kiki_background.jpg rename to jaci/modules/home-manager/wallpapers/kiki_background.jpg diff --git a/jaci/nixos/hardware-configuration.nix b/jaci/nixos/hardware-configuration.nix index 8d7c180..5b06b82 100644 --- a/jaci/nixos/hardware-configuration.nix +++ b/jaci/nixos/hardware-configuration.nix @@ -1,38 +1,52 @@ # 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. -# -# NOTE: This file is a template for Framework 12 Intel hardware. -# The disk UUIDs below are placeholders and need to be updated after -# running nixos-generate-config on the actual hardware. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/9e7135ed-b924-455b-9fdf-3c9b324fea52"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/9e7135ed-b924-455b-9fdf-3c9b324fea52"; + 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" = - { device = "/dev/disk/by-uuid/8350-826A"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/aa923d84-bc16-40d9-a100-113bb31c761d"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/8350-826A"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + # 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 # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nate/linked-dotfiles/niri/config.kdl b/nate/linked-dotfiles/niri/config.kdl index 5093c05..aaa8212 100644 --- a/nate/linked-dotfiles/niri/config.kdl +++ b/nate/linked-dotfiles/niri/config.kdl @@ -424,6 +424,6 @@ binds { } switch-events { - lid-close { spawn "systemctl" "suspend"; } - lid-open { spawn "notify-send" "The laptop lid is open!"; } + // lid-close { spawn "systemctl" "suspend"; } + // lid-open { spawn "notify-send" "The laptop lid is open!"; } }