chore(overlay): remove custom widevine-cdm build

chore: upgrade packages repositories
feat(rick): install desktop using nix
2025-09-25 22:46:24 +02:00 · 2025-09-25 22:46:23 +02:00 · 2025-09-25 21:04:17 +02:00 · 2025-09-23 15:00:40 +02:00 · 2025-09-23 10:41:21 +02:00
5 changed files with 48 additions and 51 deletions
--- a/flake.lock
+++ b/flake.lock
@ -46,11 +46,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755810213,
-        "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=",
+        "lastModified": 1758810399,
+        "narHash": "sha256-bpWoE1tiFX5T1tr5EudkpW9Kk02XR+6olkoSkf3nHZU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa",
+        "rev": "39d26c16866260eee6d0487fe9c102ba1c1bf7b2",
        "type": "github"
      },
      "original": {
@ -64,10 +64,10 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1755761639,
-        "narHash": "sha256-rEvyLY/3u1RfxsySyqScM3peGUVNJNmGApHVyIY7Cx0=",
+        "lastModified": 1758616692,
+        "narHash": "sha256-Q/7qOK6Vgjc6pBPCmnbIq2JF4XFlLYTvekS4v2OypAE=",
        "ref": "main",
-        "rev": "d73f46baaff8c9fff2a7b11c97413ea3fb171584",
+        "rev": "d59b492f9bfdb522280f1344ae25c821ba7b11b4",
        "shallow": true,
        "type": "git",
        "url": "ssh://git@git.epha.se:24422/ephase/nix-private.git"
@ -116,11 +116,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1755615617,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
        "type": "github"
      },
      "original": {
@ -131,11 +131,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1755615617,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
        "type": "github"
      },
      "original": {
@ -151,11 +151,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1755877557,
-        "narHash": "sha256-AjUqNCIgjQKfhvH+HUXZQLlSDiRTFQPSPN8Ws/O7mVQ=",
+        "lastModified": 1758828503,
+        "narHash": "sha256-IgOibVOqWSZqWsHKK6TuALfuItRymW2YpsdZBjU2yrk=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "332abf45be8133422a97e134b35782400ffc65bd",
+        "rev": "544f12f6987ceb94fe2052696da65623c238da4c",
        "type": "github"
      },
      "original": {
@ -181,11 +181,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1754988908,
-        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
+        "lastModified": 1758425756,
+        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
+        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
        "type": "github"
      },
      "original": {
--- a/hosts/rick/home-config.nix
+++ b/hosts/rick/home-config.nix
@ -1,10 +1,10 @@
-{ pkgs, ... }: {
+{ pkgs, inputs, ... }: {
  config.modules = {
    application = {
-      gnupg.enable = false;
+      gnupg.enable = true;
      zathura.enable = true;
-      foot.enable = false;
-      imv.enable = false;
+      foot.enable = true;
+      imv.enable = true;
    };
    audio = {
      cmus.enable = true;
@ -12,7 +12,11 @@
    cli = {
      direnv.enable = true;
      ghq.enable = true;
-      git.enable = true;
+      git = {
+        enable = true;
+        userEmail = inputs.nix-private.git.personal.userEmail;
+        signingKey = inputs.nix-private.git.personal.signingKey;
+      };
      neovim.enable = true;
      starship.enable = true;
      tmux.enable = true;
@ -29,8 +33,9 @@
    web.webcord.enable = false;
    gaming.lutris.enable = false;
    desktop.sway = {
-      enable = false;
+      enable = true;
      kanshi = false;
+      swaylock.useNullPackage = true;
      wallpapers.lockscreen = "${./files/lockscreen.png}";
      wallpapers.desktop = "${./files/background.png} fill #000000";
      waybar = {
@ -39,7 +44,7 @@
          enable = false;
        };
        cpuThermal = {
-          thermalZone = "2";
+          thermalZone = 2;
          # hwmonPathAbs = "";
          # inputFilename = "";
        };
--- a/hosts/rick/includes/home-manager.nix
+++ b/hosts/rick/includes/home-manager.nix
@ -1,21 +1,24 @@
 _:
 {
+  wayland.windowManager.sway.config.output = {
+    "eDP-1" = {
+      scale = "1.4";
+    };
+    "HDMI-A-1" = {
+       disable = "";
+    };
+  };
+  wayland.windowManager.sway.config.input = {
+    "4617:27904:MNT_Research_MNT_Reform_Keyboard_2.0_US/LT" = {
+      xkb_layout = "us";
+      xkb_variant = "altgr-intl";
+    };
+  };
  programs.zsh.loginExtra = ''
    #notmutch
    export NOTMUCH_CONFIG="$HOME/.config/notmuch/config"
-    export PATH=~/.local/bin:$PATH
+    # export PATH=~/.local/bin:$PATH
    # export XDG_DATA_HOME=$HOME/.local/share
    unset DEBUGINFOD_URLS
-    if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-        export QT_QPA_PLATFORM="wayland-egl"
-        export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-        export MOZ_ENABLE_WAYLAND=1
-        export QT_QPA_PLATFORMTHEME=qt5ct
-        export NO_AT_BRIDGE=1
-        export XDG_SESSION_TYPE=wayland
-        export XDG_CURRENT_DESKTOP=sway
-        export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
-        exec ~/.local/bin/sway.sh
-    fi
-    '';
-  }
+  '';
+}
--- a/modules/home-manager/cli/tmux/files/create-tmux-session.sh
+++ b/modules/home-manager/cli/tmux/files/create-tmux-session.sh
@ -162,7 +162,7 @@ tmux_vsplit() {
 tmux_hsplit() {
  local size="${1:-20}"
  debug "execute hsplit with size '${size}'"
-  tmux split-window "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size"
+  tmux split-window -t "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size"
 }

 tmux_neww() {
--- a/nixos/includes/system/overlay.nix
+++ b/nixos/includes/system/overlay.nix
@ -4,17 +4,6 @@
    (final: prev: {
      qutebrowser = prev.qutebrowser.override {
        enableWideVine = if pkgs.system == "x86_64-linux" then true else false;
-        # Get Widevine friom slackware as google CDN seems to not working anymore
-        # TODO: Remove this when resolved upstream
-        # https://github.com/NixOS/nixpkgs/issues/435671
-        widevine-cdm = pkgs.widevine-cdm.overrideAttrs (oldAttrs: {
-          src = pkgs.fetchzip {
-            url = "https://alien.slackbook.org/slackbuilds/chromium-widevine-plugin/build/4.10.2891.0-linux-x64.zip" ;
-            hash = "sha256-ZO6FmqJUnB9VEJ7caJt58ym8eB3/fDATri3iOWCULRI";
-
-            stripRoot = false;
-          };
-        });
      };
    })
    inputs.nur.overlays.default
Author	SHA1	Message	Date
Yorick Barbanneau	97de9851ed	chore(overlay): remove custom widevine-cdm build	2025-09-25 22:46:24 +02:00
Yorick Barbanneau	1a70f9c2d7	chore: upgrade packages repositories	2025-09-25 22:46:23 +02:00
Yorick Barbanneau	b19cd40328	feat(rick): install desktop using nix	2025-09-25 21:04:17 +02:00
Yorick Barbanneau	a97da40ffe	chore: upgrade nix-private repo	2025-09-23 15:00:40 +02:00
Yorick Barbanneau	a030271f48	fix(tmux-session): screen was not split in horizontal mode	2025-09-23 10:41:21 +02:00