diff --git a/flake.lock b/flake.lock index 0338d1b..4111c00 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ "linux-tkg": { "flake": false, "locked": { - "lastModified": 1702296374, - "narHash": "sha256-KYZFl0LVZ4FXXi2T6J5ELWWAhRO+CUrlditEv9fMCGc=", + "lastModified": 1704890137, + "narHash": "sha256-uh1ielVK71BP/MYK85KA8B8DBltFPF4oEeHXyKcMqyY=", "owner": "Frogging-Family", "repo": "linux-tkg", - "rev": "112adb9e50485de74c371d6efa93fb6c32a5a976", + "rev": "80fdc82a9a76b81d9fcc4a321566f285fb956e76", "type": "github" }, "original": { @@ -510,11 +510,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d5ef5c7..e6aa1ef 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ }; in { + nixosConfigurations."anemone" = mkSystem nixpkgs "anemone" "x86_64-linux" true []; nixosConfigurations."blossom" = mkSystem nixpkgs "blossom" "x86_64-linux" true []; nixosConfigurations."hyacinth" = mkSystem nixpkgs "hyacinth" "x86_64-linux" true []; diff --git a/hosts/anemone/default.nix b/hosts/anemone/default.nix new file mode 100644 index 0000000..0daf0ec --- /dev/null +++ b/hosts/anemone/default.nix @@ -0,0 +1,71 @@ +{ config, inputs, modules, overlays, pkgs, ... }: { + networking.hostName = "anemone"; + system.stateVersion = "23.11"; + time.timeZone = "Asia/Phnom_Penh"; + + nixpkgs.overlays = [ inputs.neovim-nightly.overlay ]; + age.secrets = { + passwd.file = ../../secrets/passwd.age; + #wg_hyacinth.file = ../../secrets/wg_blossom.age; + #wpa_conf.file = ../../secrets/wpa_conf.age; + }; + + imports = with modules.system; [ + inputs.home-manager.nixosModule + home-manager + + audio + base + ccache + corectrl + flatpak + greetd + gui + input + kernel + nix + packages + printing + security + snapper + #wireguard + + ./filesystem.nix + ./kernel.nix + ./networking.nix + + ../../users/rin + ]; + + environment.systemPackages = with pkgs; [ wpa_supplicant_gui ]; + + programs.hyprland.enable = true; + + hardware.firmware = let + fw = "${pkgs.linux-firmware}/lib/firmware/cirrus/"; + in [ + ( + pkgs.runCommandNoCC "cs35l41-10431683" { } '' + mkdir -p $out/lib/firmware/cirrus + cd $out/lib/firmware/cirrus + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin + + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin + + cp ${fw}/cs35l41-dsp1-spk-cali-10431e12.wmfw cs35l41-dsp1-spk-cali-10431683.wmfw + cp ${fw}/cs35l41-dsp1-spk-prot-10431e12.wmfw cs35l41-dsp1-spk-prot-10431683.wmfw + '' + ) + ]; + + # For steam fhs-env + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.1.1w" + ]; +} diff --git a/hosts/anemone/filesystem.nix b/hosts/anemone/filesystem.nix new file mode 100644 index 0000000..2ba2d02 --- /dev/null +++ b/hosts/anemone/filesystem.nix @@ -0,0 +1,36 @@ +{ config, lib, ... }: +let + mkLabelMount = label: type: { + device = "/dev/disk/by-label/${label}"; + fsType = type; + options = [ "defaults" "relatime" ]; + }; + mkBtrfsMount = name: subvol: atime: mkLabelMount name "btrfs" // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvol=${subvol}" (if atime then "relatime" else "noatime") ]; + }; + submount = mkBtrfsMount "Anemone"; +in +{ + fileSystems = { + "/" = { + device = "rootfs"; + fsType = "tmpfs"; + options = [ "defaults" "size=8G" "mode=755" ]; + }; + "/boot" = mkLabelMount "SYSTEM" "vfat"; + + "/mnt/butter" = submount "/" true; + "/nix" = submount "/current/snow" false; + "/home" = submount "/current/home" true; + "/home/.snapshots" = submount "/snapshot/home" false; + "/root" = submount "/current/root" false; + "/var" = submount "/current/var" false; + "/persist" = { + depends = [ "/var" ]; + device = "/var/persist"; + fsType = "none"; + options = [ "bind" ]; + neededForBoot = true; + }; + }; +} diff --git a/hosts/anemone/kernel.nix b/hosts/anemone/kernel.nix new file mode 100644 index 0000000..d782fe3 --- /dev/null +++ b/hosts/anemone/kernel.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: { + boot = { + loader = { + efi.canTouchEfiVariables = true; + systemd-boot.enable = true; + }; + initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + initrd.kernelModules = [ "amdgpu" ]; + kernelModules = [ "kvm-amd" ]; + kernelPackages = lib.mkForce (pkgs.linuxPackagesFor pkgs.me.linux-lava); + }; + + hardware.cpu.amd.updateMicrocode = true; +} diff --git a/hosts/anemone/networking.nix b/hosts/anemone/networking.nix new file mode 100644 index 0000000..31ee7bd --- /dev/null +++ b/hosts/anemone/networking.nix @@ -0,0 +1,16 @@ +{ config, ... }: { + networking = { + useDHCP = true; + nameservers = [ "1.1.1.1" "8.8.8.8" ]; + wireless = { + enable = true; + userControlled.enable = true; + #allowAuxiliaryImperativeNetworks = true; + }; + + extraHosts = '' + 192.168.100.12 strawberry + 192.168.100.15 caramel + ''; + }; +} diff --git a/modules/system/kernel.nix b/modules/system/kernel.nix index 181ef90..e4c5b6b 100644 --- a/modules/system/kernel.nix +++ b/modules/system/kernel.nix @@ -9,7 +9,6 @@ "kernel.core_pattern" = "|/bin/false"; "kernel.sysrq" = 1; }; - loader.grub.useOSProber = true; }; hardware.enableRedistributableFirmware = true; zramSwap.enable = true; diff --git a/modules/user/eww.nix b/modules/user/eww.nix index b0a8099..2e3e58b 100644 --- a/modules/user/eww.nix +++ b/modules/user/eww.nix @@ -1,6 +1,6 @@ # Depends on bspwm { pkgs, ... }: { - home.packages = with pkgs; [ xtitle ]; + home.packages = with pkgs; [ socat ]; programs.eww = { enable = true; configDir = ../../res/eww; diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/user/rofi.nix b/modules/user/rofi.nix index 45fcc4d..ed78204 100644 --- a/modules/user/rofi.nix +++ b/modules/user/rofi.nix @@ -1,6 +1,7 @@ -{ config, inputs, ... }: { +{ config, inputs, pkgs, ... }: { programs.rofi = { enable = true; + package = pkgs.rofi-wayland; theme = "theme"; }; xdg.configFile."rofi/theme.rasi".source = ../../res/theme.rasi; diff --git a/overlays/default.nix b/overlays/default.nix index d6c9151..5e39c5c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,7 @@ builtins.map (path: import path) [ ./corectrl.nix ./discord.nix ./eww.nix + ./linux-firmware.nix ./material-icons.nix ./picom.nix ./rofi.nix diff --git a/overlays/eww.nix b/overlays/eww.nix index 8d89aa1..bea0aec 100644 --- a/overlays/eww.nix +++ b/overlays/eww.nix @@ -1,5 +1,5 @@ self: super: { - eww = super.eww.overrideAttrs (old: rec { + eww = (super.eww.override { withWayland = true; }).overrideAttrs (old: rec { patches = old.patches ++ [ # Use normal scroll events instead of smooth scroll ( due to https://bugzilla.gnome.org/show_bug.cgi?id=675959 ) ./patches/eww.patch diff --git a/overlays/linux-firmware.nix b/overlays/linux-firmware.nix new file mode 100644 index 0000000..f2815fb --- /dev/null +++ b/overlays/linux-firmware.nix @@ -0,0 +1,20 @@ +self: super: { + linux-firmware = super.linux-firmware.overrideAttrs(o: { + installPhase = '' + ls -al + cd cirrus + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-l0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid0-r0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-l0.bin.xz + ln -s cs35l41-dsp1-spk-cali-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-cali-10431683-spkid1-r0.bin.xz + + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin.xz + ln -s cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin.xz cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin.xz + + ln -s cs35l41-dsp1-spk-cali-10431e12.wmfw.xz cs35l41-dsp1-spk-cali-10431683.wmfw.xz + ln -s cs35l41-dsp1-spk-prot-10431e12.wmfw.xz cs35l41-dsp1-spk-prot-10431683.wmfw.xz + ''; + }); +} diff --git a/packages/linux-lava/dsd_um3402yar.patch b/packages/linux-lava/dsd_um3402yar.patch new file mode 100644 index 0000000..27a13a9 --- /dev/null +++ b/packages/linux-lava/dsd_um3402yar.patch @@ -0,0 +1,20 @@ +diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c +index 2eca5822055..503f3b889f1 100644 +--- a/sound/pci/hda/cs35l41_hda_property.c ++++ b/sound/pci/hda/cs35l41_hda_property.c +@@ -54,6 +54,7 @@ + { "10431533", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, + { "10431573", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, + { "10431663", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 }, ++ { "10431683", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 }, + { "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, + { "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, +@@ -358,6 +359,7 @@ + { "CSC3551", "10431533", generic_dsd_config }, + { "CSC3551", "10431573", generic_dsd_config }, + { "CSC3551", "10431663", generic_dsd_config }, ++ { "CSC3551", "10431683", generic_dsd_config }, + { "CSC3551", "104316D3", generic_dsd_config }, + { "CSC3551", "104316F3", generic_dsd_config }, + { "CSC3551", "104317F3", generic_dsd_config }, diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index 9b0ba41..55aa46f 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,19 +1,17 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.6.7"; - kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr"; + version = "6.7.0"; + kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; mm = lib.versions.majorMinor version; tkgPatches = [ - "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" "0002-clear-patches" - "0002-mm-Support-soft-dirty-flag-read-with-reset" "0003-glitched-base" "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" - "0007-v${mm}-winesync" +# "0007-v${mm}-winesync" currently fails to patch "0012-misc-additions" ]; @@ -37,7 +35,8 @@ in { }; kernelPatches = [ - kernelPatchSrc + (patch ./dsd_um3402yar.patch) + #kernelPatchSrc ] ++ builtins.map (name: { inherit name; diff --git a/res/eww/eww.yuck b/res/eww/eww.yuck index a0a433b..73d718b 100644 --- a/res/eww/eww.yuck +++ b/res/eww/eww.yuck @@ -1,14 +1,3 @@ -(defwindow linebar :monitor 0 - :geometry (geometry :x "30px" - :y "0%" - :width "100%" - :height "2px" - :anchor "top center") - :stacking "fg" - :windowtype "dock" - :wm-ignore false - (wlinebar)) - (defwindow mainbar :monitor 0 :geometry (geometry :x "0%" :y "0%" @@ -16,8 +5,8 @@ :height "30px" :anchor "top center") :stacking "fg" - :windowtype "dock" - :wm-ignore false + :exclusive false + :focusable false (bar)) (defvar time-extended false) ; for :run-while property of below variable @@ -34,8 +23,6 @@ :run-while time-extended `date "+:%S"`) -(deflisten lworkspaces "./scripts/workspaces.sh") -(deflisten llineworkspaces "./scripts/line-workspaces.sh") (deflisten ltitle "./scripts/title.sh") (defwidget bar [] @@ -46,15 +33,19 @@ (title) (time)))) -(defwidget wlinebar [] - (eventbox :onscroll "./scripts/scroll.sh {}" - (line_workspaces))) - +(deflisten workspaces :initial "[]" "./scripts/workspaces.sh") +(deflisten current_workspace :initial "1" "./scripts/active-workspace.sh") (defwidget workspaces [] - (literal :content lworkspaces)) - -(defwidget line_workspaces [] - (literal :content llineworkspaces)) + (box :class "widget workspaces" + :halign "start" + :valign "center" + :vexpand true + :hexpand true + (for workspace in workspaces + (eventbox :cursor "hand" + (button :class "${workspace.id == current_workspace ? "focused" : (workspace.windows > 0 ? "occupied" : "empty")}" + :onclick "hyprctl dispatch workspace ${workspace.id}" + "${workspace.id == current_workspace ? "" : (workspace.windows > 0 ? "" : "")}"))))) (defwidget title [] (literal :content ltitle)) @@ -72,6 +63,5 @@ (time_extension :text {time-extended ? petimea : ""}) (label :text ptime :class "base") - (time_extension :text {time-extended ? petimeb : ""}) - ))) + (time_extension :text {time-extended ? petimeb : ""})))) diff --git a/res/eww/scripts/active-workspace.sh b/res/eww/scripts/active-workspace.sh new file mode 100755 index 0000000..cbdf971 --- /dev/null +++ b/res/eww/scripts/active-workspace.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | + stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' diff --git a/res/eww/scripts/line-workspaces.sh b/res/eww/scripts/line-workspaces.sh deleted file mode 100755 index 960c444..0000000 --- a/res/eww/scripts/line-workspaces.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env sh - -# Checks if a list ($1) contains an element ($2) -contains() { - for e in $1; do - [ "$e" -eq "$2" ] && echo 1 && return - done - echo 0 -} - -print_workspaces() { - buf="" - desktops=$(bspc query -D --names) - focused_desktop=$(bspc query -D -d focused --names) - occupied_desktops=$(bspc query -D -d .occupied --names) - urgent_desktops=$(bspc query -D -d .urgent --names) - - for d in $desktops; do - if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then - ws=$d - class="focused" - elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then - ws=$d - class="occupied" - elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then - ws=$d - class="urgent" - else - ws=$d - class="empty" - fi - - buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"\"))" - done - - echo "(box :class \"widget line-workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)" -} - -# Listen to bspwm changes -print_workspaces -bspc subscribe desktop node_transfer | while read -r _ ; do - print_workspaces -done diff --git a/res/eww/scripts/title.sh b/res/eww/scripts/title.sh index 26664ba..baaffdf 100755 --- a/res/eww/scripts/title.sh +++ b/res/eww/scripts/title.sh @@ -1,10 +1,17 @@ #!/usr/bin/env sh -xtitle -s | while read -r line ; do - trunc=$(echo $line | cut -c-85) - if [ -z "$line" ]; then +out () { + if [ -z "$1" ]; then echo "" else - echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"${trunc}\"))" + echo "(box :class \"widget title\" :halign \"center\" :valign \"center\" :vexpand true :hexpand true (label :text \"$1\"))" fi +} + +init=$(hyprctl activewindow -j | jq --raw-output .title) +out "$init" + +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | stdbuf -o0 awk -F '>>|,' '/^activewindow>>/{print $3}' | while read -r line ; do + trunc=$(echo $line | cut -c-85) + out "$trunc" done diff --git a/res/eww/scripts/workspaces.sh b/res/eww/scripts/workspaces.sh index 3eb9b52..a496f8f 100755 --- a/res/eww/scripts/workspaces.sh +++ b/res/eww/scripts/workspaces.sh @@ -1,47 +1,11 @@ #!/usr/bin/env sh -# Checks if a list ($1) contains an element ($2) -contains() { - for e in $1; do - [ "$e" -eq "$2" ] && echo 1 && return - done - echo 0 +spaces (){ + WORKSPACE_WINDOWS=$(hyprctl workspaces -j | jq 'map({key: .id | tostring, value: .windows}) | from_entries') + seq 1 10 | jq --argjson windows "${WORKSPACE_WINDOWS}" --slurp -Mc 'map(tostring) | map({id: ., windows: ($windows[.]//0)})' } -print_workspaces() { - buf="" - desktops=$(bspc query -D --names) - focused_desktop=$(bspc query -D -d focused --names) - occupied_desktops=$(bspc query -D -d .occupied --names) - urgent_desktops=$(bspc query -D -d .urgent --names) - - for d in $desktops; do - if [ "$(contains "$focused_desktop" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="focused" - elif [ "$(contains "$occupied_desktops" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="occupied" - elif [ "$(contains "$urgent_desktops" "$d")" -eq 1 ]; then - ws=$d - icon="" - class="urgent" - else - ws=$d - icon="" - class="empty" - fi - - buf="$buf (eventbox :cursor \"hand\" (button :class \"$class\" :onclick \"bspc desktop -f $ws\" \"$icon\"))" - done - - echo "(box :class \"widget workspaces\" :halign \"start\" :valign \"center\" :vexpand true :hexpand true $buf)" -} - -# Listen to bspwm changes -print_workspaces -bspc subscribe desktop node_transfer | while read -r _ ; do - print_workspaces +spaces +socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do + spaces done diff --git a/secrets.nix b/secrets.nix index a713b13..f83332a 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,11 +1,12 @@ let + anemone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEPFifSAybe97xDP/cq6AAjy7Fm0go0dtQ9ICK6JRUgc"; blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; caramel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFJT1XYyjDZFHYT/8RdxAReKkeU8QfpLrmMjEeW/80"; sugarcane = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIImymDDLSOdLcsox8wxS9Z84fsbsz6Mi58OU0od2p/ZQ"; rin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; in { - "secrets/passwd.age".publicKeys = [ blossom caramel sugarcane rin ]; + "secrets/passwd.age".publicKeys = [ anemone blossom caramel sugarcane rin ]; "secrets/wpa_conf.age".publicKeys = [ blossom caramel rin ]; "secrets/acme_dns.age".publicKeys = [ caramel rin ]; diff --git a/secrets/acme_dns.age b/secrets/acme_dns.age index aae2a16..17f90a8 100644 --- a/secrets/acme_dns.age +++ b/secrets/acme_dns.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg dDnXFO4iUwixemx1WPFZSM15/z7xtAGjZxriBbsURRg -uv6gdP/LDmZMZu/B3IWWYEzfR+H7TJsR3Zo8hYzthQE --> ssh-ed25519 krYeuQ Yo3FXb2pDijXv2JxYvNP3IF0DADygWjIHEoUlfCw3zc -vly4m2xyGfuJxBPue0mk9dodc4YAEKYTWLwx9ljVhWs --> ,-grease -v4PvG0kmxXhjh7Jf ---- 6yg8u5a9px36osMqiVI4ZPfea+ySjKB8GR/TcCG/ZXU -qT!|E#r QT QMɑIX#:f|kSis^~^ _K}"I)GI -~ы*4A^w( \ No newline at end of file +-> ssh-ed25519 krYeuQ SBY9moNFVc8mdntk13DRWSIyoJfSuzsBrhzmaH8u51c +5QU1vtRllrmYsArw6LSktuRLQ7QbrtNBKVrOG8d2pyk +-> ssh-ed25519 U9FXlg HR/A429gFyLaUq6QSyTYv8yK5syfJbLDFzmhGGTZt1M +jCXRzzzp8vfB4n8pM6BAZr/IC9E+vBeeOm0AYGYBOe0 +--- /vlh5vuiRyVyiQpn4PZ5zBeUNaQclSW5Y5z1mR43fFg +,S=;9}J|5UjB{j-v(T7l^kɀQx^?`/N|aqxI \ No newline at end of file diff --git a/secrets/passwd.age b/secrets/passwd.age index 0e7d693..7d2a224 100644 Binary files a/secrets/passwd.age and b/secrets/passwd.age differ diff --git a/secrets/warden_admin.age b/secrets/warden_admin.age index 972ef49..ef48c4d 100644 --- a/secrets/warden_admin.age +++ b/secrets/warden_admin.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg YL/xEUVIIOIeP2FRVxZhkCg/yaiX50S74HSMslKzoSw -SqzuQt4hd6ICDRlq+6Vqy0j/ZuNm3waCg7pUt9EqVD0 --> ssh-ed25519 krYeuQ IsFu0w7BFrTm5rAE6Ysxuievf3NiC60h/KkoUO51FUA -/BCYR/4qP+1449Kf2MY79sq0ahpjqI5fq7Sme2swU6U --> V;-grease ^F.M -lxjBnTXUAhPceJGeXm985SzVP4D2PsxkUEv/kKSx+6LGCHUzYAggYXi8C2ahorkY -XrYNvorBDG0aezi2GSicmAf4pQkkrLcvZhsmU+/QOKzyAxMw7V0 ---- jUlhN0y3o/J/jQlcN0um+lTQ3hZv2Ur0crxSsGeZ28c -DJ?w9%s5zkA3U"V3[in0kXi:LoaD'$O54&Ս² ^ULEQP/ \ No newline at end of file +-> ssh-ed25519 krYeuQ V3hCVmXcLm9tDavUNciUCqqCc7+hg6lJir0t4iUoOA4 +CH3+qpJsmjTJ9+lB7hr1nE5W9RteMtpkuJHlCOSrc0c +-> ssh-ed25519 U9FXlg VT5DxyuigkAL6btdC5Mt4vvCuzOB7xjuf/n/fYOALF0 +Ln3p2c9swsONWzPSkuY/ovv3HG8Sl/3dHpHqRHIckrU +--- sBS5K5WGRvcgrs9CRXZjvteE5qQrPhM/Trmhc7bU+dg +t f9Kh3"ԧcL\E@-nj b+BI; +(Q|0jrmHQ.hZ#l䘻1 OIptPxqCY \ No newline at end of file diff --git a/secrets/wg_blossom.age b/secrets/wg_blossom.age index 6b5df62..f7f550e 100644 --- a/secrets/wg_blossom.age +++ b/secrets/wg_blossom.age @@ -1,11 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 U9FXlg Y/Q29duiKdP+fV11ellTIMtHFyi9saczXfbcnq7iB0s -D9P8MAHlFOLR7P8Ux90CjljnhExARGnuSuw24AXOr5c --> ssh-ed25519 CUCjXQ eGpAJd5fydYBlC7o34CP7091jg4O4NsuLji1/rYtQVg -9/rgYCpe9wcCrLM7fTYI92oa+3+SAEK6ZgJNmBeOtnM --> A-grease xTj~+6%4 aF]RZn tj](JCp -5iDN8bexrr7eNqyFwBNCUefrOqAIS10KppbrdDJH1+fD0TkUifEOjcM2uV/+3tH2 -dYX5eM94zkmwxw ---- QKnJmu6ICTTfadXCKLKii03FXVTBqAFvbAZVHGzGLzE - ssh-ed25519 CUCjXQ iM2w01v4y0Q3DVbpGtt6f3HiHMRw7Xr08JgTB6fe8x4 +WiBMVRZr1edBVfLAPAFT4GSEGoyn9jWzO92yysNM9Mo +-> ssh-ed25519 U9FXlg Bvlaqu4nEbjfBGgBFKDmD1cBbxH2+dyz1BHzegz1AS4 ++sf3rC0J2Ik1SNtpr52GxV6G6tzGLiwlvjXFWE3qrSw +--- yaZjH1jeXqPGiw1lIkH9uz6QJo/nM1lBezbpVlJDNUM +cgj" +U"^ *ADvl2cRq).NLtZjCB5l^0)䥆. \ No newline at end of file diff --git a/secrets/wg_caramel.age b/secrets/wg_caramel.age index 2a18202..37276ac 100644 Binary files a/secrets/wg_caramel.age and b/secrets/wg_caramel.age differ diff --git a/secrets/wg_sugarcane.age b/secrets/wg_sugarcane.age index 9c96739..ef79954 100644 Binary files a/secrets/wg_sugarcane.age and b/secrets/wg_sugarcane.age differ diff --git a/secrets/wpa_conf.age b/secrets/wpa_conf.age index 60be4db..17e93a9 100644 Binary files a/secrets/wpa_conf.age and b/secrets/wpa_conf.age differ diff --git a/users/rin/default.nix b/users/rin/default.nix index 3734f52..9f33e51 100644 --- a/users/rin/default.nix +++ b/users/rin/default.nix @@ -34,15 +34,17 @@ mpv obs rofi - spicetify +# spicetify dunst eww - picom +# picom +# +# xorg +# sxhkd +# bspwm - xorg - sxhkd - bspwm + #hyprland ]; home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl { diff --git a/users/rin/packages.nix b/users/rin/packages.nix index b541f31..e6c8f0c 100644 --- a/users/rin/packages.nix +++ b/users/rin/packages.nix @@ -28,7 +28,6 @@ gimp gnome.file-roller gnome.zenity - kotatogram-desktop krita lm_sensors lutris @@ -37,7 +36,6 @@ mangohud me.tetrio-desktop-plus inputs.nix-gaming.packages.x86_64-linux.osu-lazer-bin - inputs.nix-gaming.packages.x86_64-linux.wine-osu pavucontrol prismlauncher psensor