materusPC & Old-materusPC: set "/materus" as needed for boot to fix sops

home-profile: add desktop packages
materusPC: add wireguard config to networkmanager
2024-04-19 19:54:06 +02:00 · 2024-04-19 18:30:42 +02:00 · 2024-04-19 18:28:40 +02:00 · 2024-04-19 18:28:22 +02:00 · 2024-04-19 18:27:59 +02:00 · 2024-04-19 18:27:36 +02:00
15 changed files with 228 additions and 378 deletions
--- a/configurations/host/Old-materusPC/hardware-configuration.nix
+++ b/configurations/host/Old-materusPC/hardware-configuration.nix
@ -34,6 +34,8 @@
      device = "/dev/disk/by-label/NixOS_Root";
      fsType = "btrfs";
      options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
+      neededForBoot = true;
+
    };

  fileSystems."/nix" =
@ -71,6 +73,7 @@
      device = "/materus/config/nixos-config";
      fsType = "none";
      options = [ "bind" ];
+      depends = [ "/materus" ];
    };


--- a/configurations/host/materusPC/apps.nix
+++ b/configurations/host/materusPC/apps.nix
@ -0,0 +1,106 @@
+{config, pkgs, materusArg, ...}:
+{
+    environment.systemPackages = with pkgs; [
+    gamescope
+    #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
+    materusArg.pkgs.amdgpu-pro-libs.prefixes
+    (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
+    glibc
+    glib
+    gtk3
+    gtk4
+    gsettings-desktop-schemas
+    kdePackages.dolphin
+    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+
+    patchelf
+    killall
+    util-linux
+    xorg.xhost
+    nix-top
+
+    gitFull
+    curl
+    wget
+
+    config.programs.java.package
+
+    nss_latest
+
+    pciutils
+
+    aspell
+    aspellDicts.pl
+    aspellDicts.en
+    aspellDicts.en-computers
+    steamtinkerlaunch
+    distrobox
+    # WebP support
+    libwebp
+    webp-pixbuf-loader
+
+    # Compression
+    p7zip
+    unrar
+    bzip2
+    rar
+    unzip
+    zstd
+    xz
+    zip
+    gzip
+
+    tree
+    mc
+    lf
+    htop
+    nmon
+    iftop
+    iptraf-ng
+    mprocs
+    tldr
+    bat
+    ##config.materus.profile.packages.home-manager
+    gcr
+    # pgcli
+    # litecli
+    materusArg.pkgs.alvr
+    #zenmonitor
+
+    nix-du
+
+
+    kate
+    krusader
+
+    wineWowPackages.stagingFull
+    winetricks
+    protontricks
+    gnupg
+    pinentry
+    pinentry-gnome3
+    pinentry-curses
+    ncurses
+    monkeysphere
+    gparted
+
+
+
+    virt-viewer
+
+    inkscape
+    gimp
+
+
+
+    git-crypt
+
+    bubblewrap
+    bindfs
+
+
+
+    binutils
+    
+  ];
+}
--- a/configurations/host/materusPC/default.nix
+++ b/configurations/host/materusPC/default.nix
@ -14,6 +14,7 @@
      ./kde.nix

      ./audio.nix
+      ./apps.nix
    ];


--- a/configurations/host/materusPC/hardware/filesystem.nix
+++ b/configurations/host/materusPC/hardware/filesystem.nix
@ -17,6 +17,7 @@
      device = "/materus/config/nixos-config";
      fsType = "none";
      options = [ "bind" ];
+      depends = [ "/materus" ];
    };


@ -25,6 +26,7 @@
      device = "/dev/disk/by-label/NixOS_Root";
      fsType = "btrfs";
      options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
+      neededForBoot = true;
    };

  fileSystems."/" =
--- a/configurations/host/materusPC/kde.nix
+++ b/configurations/host/materusPC/kde.nix
@ -31,17 +31,17 @@ let
    '';
 in
 {
-  services.xserver.displayManager.defaultSession = "plasma";
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.displayManager.sddm.wayland.enable = true;
-  services.xserver.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
-  services.xserver.displayManager.sddm.wayland.compositorCommand = lib.concatStringsSep " " [
+  services.displayManager.defaultSession = "plasma";
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
+  services.displayManager.sddm.wayland.compositorCommand = lib.concatStringsSep " " [
    "${lib.getExe pkgs.weston}"
    "--shell=kiosk"
    "-c ${westonSddm}"
  ];

-  services.xserver.displayManager.sddm.settings = {
+  services.displayManager.sddm.settings = {
    General = {
      InputMethod = "";
    };
--- a/configurations/host/materusPC/network.nix
+++ b/configurations/host/materusPC/network.nix
@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, materusArg, ... }:
 {
+  sops.templates."networkmanager.env".content = ''
+    WIREGUARD_PRIVATEKEY="${config.sops.placeholder.wireguard}"
+  '';
+
  networking.useDHCP = lib.mkDefault true;
  networking.hostName = "materusPC";
  networking.wireless.iwd.enable = true;
@ -14,5 +18,34 @@
    uri=http://nmcheck.gnome.org/check_network_status.txt
  '';

-
+  networking.networkmanager.ensureProfiles.environmentFiles = [
+    config.sops.templates."networkmanager.env".path
+  ];
+  networking.networkmanager.ensureProfiles.profiles = {
+    wg0 = {
+      connection = {
+        id = "wg0";
+        type = "wireguard";
+        interface-name = "wg0";
+      };
+      wireguard = {
+        private-key = "$WIREGUARD_PRIVATEKEY";
+      };
+      "wireguard-peer.${materusArg.wireguard.pubKeys.valkyrie}" = {
+        endpoint = "${materusArg.ips.valkyrie}:${materusArg.wireguard.port}";
+        allowed-ips = "${materusArg.ip-masks.wireguard.general};";
+      };
+      ipv4 = {
+        address1 = "${materusArg.ips.wireguard.materusPC}/23";
+        dns = "${materusArg.ips.wireguard.valkyrie};";
+        method = "manual";
+        never-default = "true";
+      };
+      ipv6 = {
+        addr-gen-mode = "stable-privacy";
+        method = "disabled";
+      };
+      proxy = { };
+    };
+  };
 }
--- a/configurations/host/materusPC/secrets/default.nix
+++ b/configurations/host/materusPC/secrets/default.nix
@ -8,8 +8,10 @@
  sops.age.generateKey = false;
  sops.gnupg.home = null;
  sops.gnupg.sshKeyPaths = [ ];
+  sops.age.sshKeyPaths = [ "/materus/root/ssh_host_ed25519_key" ];
  sops.defaultSopsFile = materusCfg.hostPath + "/secrets/secrets.yaml";
-  sops.secrets."users/materus" = { };
+  sops.secrets."users/materus" = { neededForUsers = true; };
+  sops.secrets.wireguard = { };

  services.openssh.hostKeys = [
    {
@ -22,5 +24,4 @@
      type = "ed25519";
    }
  ];
-
 }
--- a/configurations/host/materusPC/secrets/secrets.yaml
+++ b/configurations/host/materusPC/secrets/secrets.yaml
@ -1,6 +1,7 @@
 users:
    materus: ENC[AES256_GCM,data:okqSgMvdFq1BMAg+Gs725zaNbeAQIpJKSPB2Sa83i3EYimphZNBtrJLen+gQEGNq4yeTyAc9Ih/hcnr+3z+Tea/g9ffh/UC4YA==,iv:OhKoWLREAqCbtmS3Rw9nE9+PtcBLwEHimJXcj4oejRA=,tag:Ht/SQSwumnQR6E45Pl47AQ==,type:str]
    root: ENC[AES256_GCM,data:vnPjK+xayk/Zk895rERYAeCzpjv5NJ7EAyK4MRDUzDbW++4Dy+UEI81v1v7w9dfpDeL+x5kOqUFO5zVVDUGfZ3yf/l8M8N8KcA==,iv:gGFGcy3K27nQxn0+7I/t0kg3nZyXeGWqysOl2auZJXo=,tag:N+LYhKpPCbI1EjEBwxuh1g==,type:str]
+wireguard: ENC[AES256_GCM,data:rBkftzBcdamhP0xZB3qxfLptL8bX1qc7SdcfPNpYV67TeQs6i79+5KB/da4=,iv:22J5SZbFtYco7iSHvD2GD1bcazfGWlyEJ2isa3Ab4bI=,tag:BeUn9Srl2vyoDgK5Xv0UCg==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -16,8 +17,8 @@ sops:
            dWVzbzUyakxXUGpTQjNsYzcyVG1aRDgKXVa8tIAbmggw1vSt3NJYRLgXhbagpNrX
            RNXyndPaeQXVPVXuJWmHgRCYbwPTcfAFpGwFlX2IxVLlmC914Zklhw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-03-03T01:46:25Z"
-    mac: ENC[AES256_GCM,data:6YlLYKUzG2rorS22B6s4P6wJHCU1BWfEazXoEfEITB/qe3Ek3ITafX+RZI7pYLMiatIt9GHPb3YzDt6tOb91EakodC9pBTmW1E6NRzCZDr96nBQ+oIEmGBOOBwq/ysAeJRga0Sz5Xfx6rjRVCTARSLOmbouW5EF/bCKFVowgPYU=,iv:iZkBEIXreVic57ishmziIDNw6H6cNqA32ZxjTa8mjzA=,tag:ws3bj3T4xEGlq7YoB4RH1A==,type:str]
+    lastmodified: "2024-04-19T15:58:46Z"
+    mac: ENC[AES256_GCM,data:BLa0G3ci8EWH43UkLI2OoFJp2F9YeuKDrg6+2I/bq/lLi/YUitkJvBkA9VSIbvCyYWs/5SlEL5MayX8iiVdJ7r9bCiw+LVsWNAdaYDCafbZRW5F7KiHS5WXV3v4c201kFok7rmnRhEfKfdDxLlQ/mFHqOhupHU/qCNMTuUzJBiA=,iv:EPRoXHVMB6I16lTFJdFVAuSnMD/B55fPYtSBOQddutE=,tag:gohg+BdRlMPAQmNpRdk8sg==,type:str]
    pgp:
        - created_at: "2024-03-02T22:10:50Z"
          enc: |-
--- a/configurations/host/materusPC/tmp.nix
+++ b/configurations/host/materusPC/tmp.nix
@ -4,11 +4,7 @@
  virtualisation.lxc.enable = true;
  virtualisation.lxc.lxcfs.enable = true;
  virtualisation.lxd.enable = true;
-  #virtualisation.lxd.recommendedSysctlSettings = true;

-  #programs.corectrl.enable = true;
-  #programs.corectrl.gpuOverclock.enable = true;
-  #programs.corectrl.gpuOverclock.ppfeaturemask = "0xffffffff";
  programs.gamemode.enable = true;


@ -33,13 +29,8 @@
  services.dbus.packages = [ pkgs.gcr ];


-  #services.xserver.displayManager.autoLogin.user = "materus";
+
  services.xserver.displayManager.startx.enable = false;
-  /*
-    services.xserver.displayManager.lightdm.enable = true;
-    services.xserver.displayManager.lightdm.greeters.enso.enable = true;
-    services.xserver.displayManager.lightdm.greeters.enso.blur = true;
-  */

  xdg.portal.enable = true;
  xdg.portal.wlr.enable = true;
@ -72,7 +63,6 @@
  virtualisation.waydroid.enable = false;
  virtualisation.podman = {
    enable = true;
-    #enableNvidia = true;
    dockerCompat = true;
    dockerSocket.enable = true;
  };
@ -112,9 +102,7 @@
    QT_IM_MODULE = "fcitx";
    XMODIFIERS = "@im=fcitx";
    SDL_IM_MODULE = "fcitx";
-    #SDL_AUDIODRIVER = "pipewire";

-    #SSH_ASKPASS_REQUIRE = "prefer";

    MOZ_USE_XINPUT2 = "1";
    PATH = [
@ -130,9 +118,7 @@
  i18n.inputMethod.fcitx5.addons = [ pkgs.kdePackages.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.kdePackages.fcitx5-qt ];


-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
+
  services.pcscd.enable = true;
  services.samba-wsdd.enable = true;

@ -166,266 +152,7 @@
  materus.profile.browser.enable = true;


-
-  /*containers.test = {
-    config = { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ wayfire ]; };
-    autoStart = false;
-    };*/
  services.davfs2.enable = true;
-  environment.systemPackages = with pkgs; [
-    gamescope
-    #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
-    materusArg.pkgs.amdgpu-pro-libs.prefixes
-    (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
-    glibc
-    glib
-    gtk3
-    gtk4
-    gsettings-desktop-schemas
-    kdePackages.dolphin
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-
-    patchelf
-    killall
-    util-linux
-    xorg.xhost
-    nix-top
-
-    gitFull
-    curl
-    wget
-
-    config.programs.java.package
-
-    nss_latest
-
-    pciutils
-
-    aspell
-    aspellDicts.pl
-    aspellDicts.en
-    aspellDicts.en-computers
-    steamtinkerlaunch
-    distrobox
-    # WebP support
-    libwebp
-    webp-pixbuf-loader
-
-    # Compression
-    p7zip
-    unrar
-    bzip2
-    rar
-    unzip
-    zstd
-    xz
-    zip
-    gzip
-
-    tree
-    mc
-    lf
-    htop
-    nmon
-    iftop
-    iptraf-ng
-    mprocs
-    tldr
-    bat
-    ##config.materus.profile.packages.home-manager
-    gcr
-    # pgcli
-    # litecli
-    materusArg.pkgs.alvr
-    #zenmonitor
-
-    nix-du


-    kate
-    krusader
-
-    wineWowPackages.stagingFull
-    winetricks
-    protontricks
-    gnupg
-    pinentry
-    pinentry-gnome3
-    pinentry-curses
-    ncurses
-    monkeysphere
-    gparted
-
-
-
-    virt-viewer
-
-    inkscape
-    gimp
-
-
-
-    git-crypt
-
-    bubblewrap
-    bindfs
-
-
-
-    binutils
-    
-  ];
-
-
-
-
-
-
-
-  environment.etc = {
-
-
-    /*
-      "libvirt/hooks/qemu.d/win11/prepare/begin/start.sh" = {
-      text =
-      ''
-      #!/usr/bin/env bash
-      # Debugging
-      exec 19>/home/materus/startlogfile
-      BASH_XTRACEFD=19
-      set -x
-
-      exec 3>&1 4>&2
-      trap 'exec 2>&4 1>&3' 0 1 2 3
-      exec 1>/home/materus/startlogfile.out 2>&1
-
-
-
-      # Stop display manager
-      killall -u materus
-      systemctl stop display-manager.service
-      killall gdm-x-session
-      #systemctl isolate multi-user.target
-      sleep 1
-
-
-      # Load variables we defined
-      source "/etc/libvirt/hooks/kvm.conf"
-
-      # Isolate host to core 0
-      systemctl set-property --runtime -- user.slice AllowedCPUs=0
-      systemctl set-property --runtime -- system.slice AllowedCPUs=0
-      systemctl set-property --runtime -- init.scope AllowedCPUs=0
-
-
-
-      # Unbind VTconsoles
-      for (( i = 0; i < 16; i++))
-      do
-      if test -x /sys/class/vtconsole/vtcon"''${i}"; then
-      if [ "$(grep -c "frame buffer" /sys/class/vtconsole/vtcon"''${i}"/name)" = 1 ]; then
-      echo 0 > /sys/class/vtconsole/vtcon"''${i}"/bind
-      echo "$DATE Unbinding Console ''${i}"
-      fi
-      fi
-      done
-
-      # Unbind EFI Framebuffer
-      echo "efi-framebuffer.0" > /sys/bus/platform/drivers/efi-framebuffer/unbind
-
-      # Avoid race condition
-      sleep 1
-
-      # Unload NVIDIA kernel modules
-      modprobe -r nvidia_uvm
-      modprobe -r nvidia_drm
-      modprobe -r nvidia_modeset
-      modprobe -r nvidia
-      modprobe -r i2c_nvidia_gpu
-      modprobe -r drm_kms_helper
-      modprobe -r drm
-
-      # Detach GPU devices from host
-      #virsh nodedev-detach $VIRSH_GPU_VIDEO
-      #virsh nodedev-detach $VIRSH_GPU_AUDIO
-      #virsh nodedev-detach $VIRSH_GPU_USB
-      #virsh nodedev-detach $VIRSH_GPU_SERIAL_BUS
-
-      # Load vfio module
-      modprobe vfio
-      modprobe vfio_pci
-      modprobe vfio_iommu_type1
-      '';
-      mode = "0755";
-      };
-
-      "libvirt/hooks/qemu.d/win11/release/end/stop.sh" = {
-      text =
-      ''
-      #!/usr/bin/env bash
-      # Debugging
-      exec 19>/home/materus/stoplogfile
-      BASH_XTRACEFD=19
-      set -x
-
-      exec 3>&1 4>&2
-      trap 'exec 2>&4 1>&3' 0 1 2 3
-      exec 1>/home/materus/stoplogfile.out 2>&1
-
-      # Load variables we defined
-      source "/etc/libvirt/hooks/kvm.conf"
-
-      # Unload vfio module
-      modprobe -r vfio-pci
-      modprobe -r vfio_iommu_type1
-      modprobe -r vfio
-
-
-
-      modprobe drm
-      modprobe drm_kms_helper
-      modprobe i2c_nvidia_gpu
-      modprobe nvidia
-      modprobe nvidia_modeset
-      modprobe nvidia_drm
-      modprobe nvidia_uvm
-
-      # Attach GPU devices from host
-      #virsh nodedev-reattach $VIRSH_GPU_VIDEO
-      #virsh nodedev-reattach $VIRSH_GPU_AUDIO
-      #virsh nodedev-reattach $VIRSH_GPU_USB
-      #virsh nodedev-reattach $VIRSH_GPU_SERIAL_BUS
-
-      #echo "0000:01:00.0" > /sys/bus/pci/drivers/nvidia/bind
-      # Bind EFI Framebuffer
-      echo "efi-framebuffer.0" > /sys/bus/platform/drivers/efi-framebuffer/bind
-
-      # Bind VTconsoles
-      echo 1 > /sys/class/vtconsole/vtcon0/bind
-      #echo 1 > /sys/class/vtconsole/vtcon1/bind
-
-
-      # Start display manager
-      sleep 1
-      systemctl start display-manager.service
-
-      # Return host to all cores
-      systemctl set-property --runtime -- user.slice AllowedCPUs=0-3
-      systemctl set-property --runtime -- system.slice AllowedCPUs=0-3
-      systemctl set-property --runtime -- init.scope AllowedCPUs=0-3
-      '';
-        
-
-
-      text = ''
-      #!/usr/bin/env bash
-      reboot
-      '';*-/
-      mode = "0755";
-      };
-      "libvirt/vgabios/patched.rom".source = ./vbios.rom;
-      }; 
-      };
-    */
-  };
 }
--- a/configurations/host/waffentrager/secrets/default.nix
+++ b/configurations/host/waffentrager/secrets/default.nix
@ -23,7 +23,6 @@
  ];
  sops.secrets.wireguard = { };
  sops.secrets."users/materus" = { neededForUsers = true; };
-  sops.secrets.certs = { };
  sops.secrets.elements = { };
  sops.secrets.nextcloud-adminpass = { };
 }
--- a/configurations/host/waffentrager/secrets/secrets.yaml
+++ b/configurations/host/waffentrager/secrets/secrets.yaml
@ -3,7 +3,6 @@ nextcloud-adminpass: ENC[AES256_GCM,data:5vohRPEcJJ8gIRro38O73ufSYYEp1DXpBgjCPdP
 elements: ENC[AES256_GCM,data:Kh6ueReXpj9h5yQ3P0qY8X1ow4RRZD9zyXZLS6DUIIVuthgqgu9dPzBc7ojnz6nXoYTHt1I2LJJKLOGQYZC+iVxXOk+QADJMPwY4NCyeZ3prgvYMghlD,iv:WFA/UQ0XDFjpbgaDEacrBxkteLitXv3CJP54ANVSJHM=,tag:M+tTpTR0alvQxvUiP2MWlA==,type:str]
 users:
    materus: ENC[AES256_GCM,data:MhPrMJ4/0oxEsFZDUKcYb3WMUWLI2ZbRTgnh1fQZG1Ly2J781jcUWtA8vVAdMBedNfWky0mDq5+KEQ/2fJNGU4IkTBvLdAqnWw==,iv:Dpl+M+x1weNIVkEsf3I/uXpG0SM6bDz+d9w7AYwn/MY=,tag:yGc1D2ODp6Te/QAztOj7yA==,type:str]
-certs: ENC[AES256_GCM,data:3Wzl23y3CDXRe6SlWKXcKBrYz/l3Y0fuif4HTs2UzjnqQ1z36IataIV11vnXbrERtGPtr6NOS66ebTLrVpsCyGTt0Lmucxmirleetqw2JI9/2Z0Y4M32FmQDHFjMltcOqNNT0q3QlSwU7rAeFzkgdayhbSIhxA5Hr/pn236KiSGHlauOniATIs9sBKjWhaa/facH5I4N1Vx5SMlurlefzaLFOQ==,iv:VFgbpyLsbalOnOA/7IgB8pUZ/U7JAswiCNeWEpjscMo=,tag:BIDj655QorEwPez7trCzkw==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -19,8 +18,8 @@ sops:
            eFN4VVdUMkVjcTVWNFdLM0xtbExLdncK6LYUufWzIcd2jFyEeZDypo0xkJQ4z91F
            ULyGxJLLWl6/inYXtxHNdxIIPfwW+5yppBAbXaOgvABi1E7tf1JZcA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-12T06:59:28Z"
-    mac: ENC[AES256_GCM,data:JA2hcgsXvmhmF4pUv7pk7zaDwqza7e3zVbHNnWGcoRb/rrgJgsDlJL76RWuSGciAolmmJ6flou6IrGGoV9tq9A/tceepPyw3+CJ8+8zfFBltrDKnclzz4mhuw14rec1wFYziuqf719XTut0IY0hCTPd27W74irMJVP9hQ3YZtC0=,iv:NIn8abwLqhkY1eMkEGxCVdcXc+Ick1up4vuQZ/IfdA0=,tag:MWnmAPVclrUg6IXtRoD7vg==,type:str]
+    lastmodified: "2024-04-12T11:21:33Z"
+    mac: ENC[AES256_GCM,data:TbWjHvrJAB55AjFsbOK/IPb7v4wzqL2JGLvnNTr+ah/c2brdlq6DWeAF2+HA3FpLRt2a0MajwMTCsconoe8hW6Am/WO0FJBoYlneLAl/RlAv7BYfyorTD/Vyp9am7ml5T3f2pdYdsw1k/5RSn1ulUg43vSgi5es5Co8CtzC5hPE=,iv:+V48Azrr9yArwqNi3POYh7QaRMfUreCf7Bmv7kjV9qo=,tag:HDcMMCnyfVQRHTQJZB0R3Q==,type:str]
    pgp:
        - created_at: "2024-03-21T18:15:00Z"
          enc: |-
--- a/configurations/profile/common/packages/default.nix
+++ b/configurations/profile/common/packages/default.nix
@ -30,12 +30,12 @@ with materusArg.pkgs.lib;
  ]);

  options.materus.profile.packages.list.desktopApps = mkPrivateVar (with pkgs; [
-    barrier
    (discord.override { nss = nss_latest; withOpenASAR = true; withTTS = true; })
    tdesktop
    mpv
    ani-cli
-    #(pkgs.obsidian)
+    obsidian
+    nextcloud-client
    spotify
    thunderbird
    keepassxc
--- a/configurations/profile/common/private/default.nix
+++ b/configurations/profile/common/private/default.nix
--- a/configurations/profile/os/games/steam.nix
+++ b/configurations/profile/os/games/steam.nix
@ -1,29 +1,7 @@
 { config, pkgs, lib, materusArg, inputs, ... }:
 let
-  optHip = pkgs.stdenv.mkDerivation rec {
-    pname = "optHip";
-    version = pkgs.rocmPackages.clr.version;
-
-
-    dontFixup = true;
-    dontBuild = true;
-    dontPatchELF = true;
-    dontUnpack = true;
-    sourceRoot = ".";
-
-    buildInputs = [
-      pkgs.rocmPackages.clr
-    ];
-
-    installPhase = ''
-      mkdir -p $out/opt/rocm
-      ln -s ${pkgs.rocmPackages.clr} $out/opt/rocm/hip
-    '';
-  };
-
  steamPkg = pkgs.steam.override {
    extraPkgs = pkgs: [
-      #optHip #for blender
      pkgs.libdecor
      pkgs.obs-studio-plugins.obs-vkcapture
      pkgs.steamcmd
@ -54,7 +32,7 @@ let
      pkgs.libinput
      pkgs.openvdb
      pkgs.openssl
-      pkgs.tbb_2021_8
+      pkgs.tbb
      pkgs.gtk4
      pkgs.gtk3
      pkgs.glib
--- a/flake.lock
+++ b/flake.lock
@ -114,11 +114,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1711099426,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "lastModified": 1713532798,
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
        "type": "github"
      },
      "original": {
@ -140,11 +140,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1711099426,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "lastModified": 1713532798,
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
        "type": "github"
      },
      "original": {
@ -167,11 +167,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1712336909,
-        "narHash": "sha256-tpmLGa9l2cwsf/1g4tPFOQDOeDrEgAsKHFhKabd0nyo=",
+        "lastModified": 1713517520,
+        "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "b82c77652e4191f41842c6ae39853490f0cc1e13",
+        "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15",
        "type": "github"
      },
      "original": {
@ -194,11 +194,11 @@
        "nixpkgs-stable": "nixpkgs-stable_3"
      },
      "locked": {
-        "lastModified": 1712336909,
-        "narHash": "sha256-tpmLGa9l2cwsf/1g4tPFOQDOeDrEgAsKHFhKabd0nyo=",
+        "lastModified": 1713517520,
+        "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "b82c77652e4191f41842c6ae39853490f0cc1e13",
+        "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15",
        "type": "github"
      },
      "original": {
@ -337,11 +337,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1710888565,
-        "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
+        "lastModified": 1712386041,
+        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
+        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
        "type": "github"
      },
      "original": {
@ -359,11 +359,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712317700,
-        "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
+        "lastModified": 1713539802,
+        "narHash": "sha256-aub7mcsDv5J6PcYNxcLUCIaNGNlInPCAYYoCA1x76oY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
+        "rev": "1f305c363ecd7c6505f03fc7baba15505f3aa630",
        "type": "github"
      },
      "original": {
@ -378,10 +378,10 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1712093955,
-        "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
-        "path": "/nix/store/41m3hm6nlgz88vv3zxpjmmrk0r08v9ba-source",
-        "rev": "80546b220e95a575c66c213af1b09fe255299438",
+        "lastModified": 1712317700,
+        "narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
+        "path": "/nix/store/6kq2krynx50y7ws18xhpljn5rjzk37ps-source",
+        "rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
        "type": "path"
      },
      "original": {
@ -445,11 +445,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1712324865,
-        "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
+        "lastModified": 1713521961,
+        "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
+        "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
        "type": "github"
      },
      "original": {
@ -461,11 +461,11 @@
    },
    "nixos-hardware_2": {
      "locked": {
-        "lastModified": 1712324865,
-        "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
+        "lastModified": 1713521961,
+        "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
+        "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
        "type": "github"
      },
      "original": {
@ -493,11 +493,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1712168706,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "lastModified": 1713344939,
+        "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
        "type": "github"
      },
      "original": {
@ -509,11 +509,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1711819797,
-        "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
+        "lastModified": 1713434076,
+        "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
+        "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c",
        "type": "github"
      },
      "original": {
@ -525,11 +525,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1712168706,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "lastModified": 1713344939,
+        "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
        "type": "github"
      },
      "original": {
@ -541,11 +541,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1711819797,
-        "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
+        "lastModified": 1713434076,
+        "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
+        "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c",
        "type": "github"
      },
      "original": {
@ -557,11 +557,11 @@
    },
    "nixpkgs-stable_5": {
      "locked": {
-        "lastModified": 1712168706,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "lastModified": 1713344939,
+        "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
        "type": "github"
      },
      "original": {
@ -573,11 +573,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1712163089,
-        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "lastModified": 1713297878,
+        "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
        "type": "github"
      },
      "original": {
@ -602,11 +602,11 @@
    },
    "nur_2": {
      "locked": {
-        "lastModified": 1712342638,
-        "narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=",
+        "lastModified": 1713540396,
+        "narHash": "sha256-mc9hP0I2K2I23fx0py4bp6k28liXgBRilVQRc5hb3LU=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57",
+        "rev": "e16ee8a64f1ab6bfbd54f24985141a0bd1243c29",
        "type": "github"
      },
      "original": {
@ -631,11 +631,11 @@
    },
    "nur_4": {
      "locked": {
-        "lastModified": 1712342638,
-        "narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=",
+        "lastModified": 1713540396,
+        "narHash": "sha256-mc9hP0I2K2I23fx0py4bp6k28liXgBRilVQRc5hb3LU=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57",
+        "rev": "e16ee8a64f1ab6bfbd54f24985141a0bd1243c29",
        "type": "github"
      },
      "original": {
@ -647,10 +647,10 @@
    },
    "nur_5": {
      "locked": {
-        "lastModified": 1712133822,
-        "narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
-        "path": "/nix/store/dprq3vl3bv6jxkhbby0d4nplqgi2gfjy-source",
-        "rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
+        "lastModified": 1712342638,
+        "narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=",
+        "path": "/nix/store/v54rd44np54b7ka6vsz92vrwnq7bi5gi-source",
+        "rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57",
        "type": "path"
      },
      "original": {
@ -695,11 +695,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1711855048,
-        "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
+        "lastModified": 1713532771,
+        "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
+        "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755",
        "type": "github"
      },
      "original": {
@ -718,11 +718,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1711855048,
-        "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
+        "lastModified": 1713532771,
+        "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
+        "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755",
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Mateusz Słodkowicz	fd3599f7f3	materusPC & Old-materusPC: set "/materus" as needed for boot to fix sops	2024-04-19 19:54:06 +02:00
Mateusz Słodkowicz	d90b32d282	home-profile: add desktop packages	2024-04-19 18:30:42 +02:00
Mateusz Słodkowicz	d6a451b6c5	materusPC: add wireguard config to networkmanager	2024-04-19 18:28:40 +02:00
Mateusz Słodkowicz	f19a1bd613	materusPC: import apps.nix	2024-04-19 18:28:22 +02:00
Mateusz Słodkowicz	be955fe3ca	materusPC: fix kde after flake update	2024-04-19 18:27:59 +02:00
Mateusz Słodkowicz	7fabda1305	os-config: change steam tbb pkg	2024-04-19 18:27:36 +02:00
Mateusz Słodkowicz	15d193b2eb	flake: update lock	2024-04-19 18:27:17 +02:00
Mateusz Słodkowicz	3fd49d452b	materusPC: add apps.nix	2024-04-19 18:27:05 +02:00
Mateusz Słodkowicz	2959e10532	waffentrager: remove cert	2024-04-19 17:21:22 +02:00