-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
97 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,53 +11,25 @@ in | |
| modules = [ | ||
| ../../../modules/home-manager/terminal_environment | ||
| ../../../modules/home-manager/terminal_environment/hsxkpasswd | ||
| ../../../modules/home-manager/terminal_environment/rclone | ||
| ../../../modules/home-manager/terminal_environment/ssh-config | ||
| ../../../modules/home-manager/desktop_environment | ||
| ../../../modules/home-manager/borgmatic.nix | ||
| ../../../modules/home-manager/cad.nix | ||
| ../../../modules/home-manager/development.nix | ||
| ../../../modules/home-manager/media.nix | ||
| ../../../modules/home-manager/office.nix | ||
|
|
||
| ({ | ||
| config, | ||
| pkgs, | ||
| ... | ||
| }: rec { | ||
| ({pkgs, ...}: { | ||
| home.packages = with pkgs; [ | ||
| lightburn | ||
| scrcpy | ||
| nur.repos.DanNixon.metty | ||
| nur.repos.DanNixon.satorictl-unstable | ||
| ]; | ||
|
|
||
| services.flatpak.packages = [ | ||
| "org.chromium.Chromium" | ||
| "com.microsoft.Edge" | ||
|
|
||
| "com.adobe.Flash-Player-Projector" | ||
| ]; | ||
|
|
||
| xdg.userDirs.music = "${config.home.homeDirectory}/music"; | ||
| services.mpd.enable = true; | ||
|
|
||
| programs.borgmatic.backups."main" = { | ||
| location = { | ||
| sourceDirectories = [ | ||
| "/home/dan/docs" | ||
| "/home/dan/notebook" | ||
| "/home/dan/.local/share/password-store" | ||
| "/home/dan/phone" | ||
| ]; | ||
| repositories = ["ssh://[email protected]/./repo"]; | ||
| }; | ||
| storage.encryptionPasscommand = "pass borg/akane/passphrase"; | ||
| }; | ||
|
|
||
| wayland.windowManager.sway = { | ||
| checkConfig = false; # Does not work with background image paths | ||
|
|
||
| config = { | ||
| input."2:7:SynPS/2_Synaptics_TouchPad" = { | ||
| events = "disabled"; | ||
|
|
@@ -66,17 +38,11 @@ in | |
| output = { | ||
| LVDS-1 = { | ||
| enable = ""; | ||
| bg = "~/${home.file.wallpaper.target} fill"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| home.file.wallpaper = { | ||
| source = ../../../wallpapers/aya.png; | ||
| target = ".local/share/wallpaper.png"; | ||
| }; | ||
|
|
||
| programs.i3status-rust.bars.main.blocks = [ | ||
| { | ||
| block = "sound"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| disko.devices.disk = { | ||
| sda = { | ||
| type = "disk"; | ||
| device = "/dev/disk/by-id/ata-Samsung_SSD_870_QVO_1TB_S5RRNF1T507732J"; | ||
|
|
||
| content = { | ||
| type = "gpt"; | ||
|
|
||
| partitions = { | ||
| boot = { | ||
| name = "boot"; | ||
| size = "1M"; | ||
| type = "EF02"; | ||
| }; | ||
|
|
||
| ESP = { | ||
| name = "ESP"; | ||
| size = "512M"; | ||
| type = "EF00"; | ||
|
|
||
| content = { | ||
| type = "filesystem"; | ||
| format = "vfat"; | ||
| mountpoint = "/boot"; | ||
| }; | ||
| }; | ||
|
|
||
| root = { | ||
| name = "root"; | ||
| size = "100%"; | ||
|
|
||
| content = { | ||
| type = "luks"; | ||
| name = "cryptedroot"; | ||
| extraOpenArgs = ["--allow-discards"]; | ||
|
|
||
| content = { | ||
| type = "filesystem"; | ||
| format = "ext4"; | ||
| mountpoint = "/"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| {...}: { | ||
| boot.loader = { | ||
| systemd-boot.enable = true; | ||
| efi.canTouchEfiVariables = true; | ||
| }; | ||
|
|
||
| boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod"]; | ||
| boot.kernelModules = ["kvm-intel"]; | ||
|
|
||
| hardware.cpu.intel.updateMicrocode = true; | ||
|
|
||
| nixpkgs.hostPlatform = "x86_64-linux"; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.