From 2e274bee2bba3d213da80e977c36d090b683bfc8 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 11 Mar 2024 22:59:44 +0100 Subject: [PATCH 1/6] home: Move jitsi-meet into a module --- home/alex/home.nix | 11 ++--------- home/alex/programs/jitsi-meet/default.nix | 5 +++++ 2 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 home/alex/programs/jitsi-meet/default.nix diff --git a/home/alex/home.nix b/home/alex/home.nix index e88d65b..be61380 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -5,6 +5,7 @@ ./cli.nix ./programs/rofi ./programs/xmonad + ./programs/jitsi-meet ./services/polybar ./services/dunst ./services/udiskie @@ -26,15 +27,7 @@ packages = with pkgs; [ # social - (jitsi-meet-electron.overrideAttrs (prev: rec { - version = "2023.10.0"; - src = fetchurl { - url = - "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-zhOx/gdsiQMuOCCE5sn+JNu0WJrH36XfvqqNvE24St8="; - name = "jitsi-meet-electron-${version}.AppImage"; - }; - })) # jitsi as a stand-alone app + jitsi-meet-electron discord # talk to other people # system tools diff --git a/home/alex/programs/jitsi-meet/default.nix b/home/alex/programs/jitsi-meet/default.nix new file mode 100644 index 0000000..1037a92 --- /dev/null +++ b/home/alex/programs/jitsi-meet/default.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: + +{ + config.home.packages = [ pkgs.jitsi-meet-electron ]; +} From d7d302a0b75c487f7e810cc8d8812c1273e15cda Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 11 Mar 2024 23:01:09 +0100 Subject: [PATCH 2/6] xmonad: Bind M-s M-s to emacsclient scratchpad --- home/alex/programs/xmonad/config.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/alex/programs/xmonad/config.hs b/home/alex/programs/xmonad/config.hs index 7e262e6..c0d1cef 100644 --- a/home/alex/programs/xmonad/config.hs +++ b/home/alex/programs/xmonad/config.hs @@ -116,7 +116,7 @@ myConfig = , ("M-g", WS.prevWS) , ("M-r", WS.nextWS) , -- scratchpads - ("M-s n", namedScratchpadAction scratchpads "notes") + ("M-s M-s", namedScratchpadAction scratchpads "notes") , ("M-s s", namedScratchpadAction scratchpads "shell") , -- backlight control From 03de6c194d8b68ae68854733f206119c690e0e9f Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 11 Mar 2024 23:32:32 +0100 Subject: [PATCH 3/6] flake: Update nixpkgs-unstable and related --- flake.lock | 32 ++++++++++---------- home/alex/services/screen-locker/default.nix | 2 +- hosts/dregil/default.nix | 3 +- modules/wm/x.nix | 7 +++-- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 8a02b4d..621f502 100644 --- a/flake.lock +++ b/flake.lock @@ -89,11 +89,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702399955, - "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=", + "lastModified": 1710176745, + "narHash": "sha256-3Av9cY2xw8Lbq56o23uKwYbbrjH4We0SqveKNejlHpU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923", + "rev": "30fdb303a64d5fcbbaf0609b75d3c9c783af7869", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -219,11 +219,11 @@ ] }, "locked": { - "lastModified": 1702538064, - "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=", + "lastModified": 1710164657, + "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af", + "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", "type": "github" }, "original": { @@ -403,16 +403,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702221085, - "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -435,11 +435,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { diff --git a/home/alex/services/screen-locker/default.nix b/home/alex/services/screen-locker/default.nix index 43d5e3d..9f714e6 100644 --- a/home/alex/services/screen-locker/default.nix +++ b/home/alex/services/screen-locker/default.nix @@ -5,6 +5,6 @@ enable = true; inactiveInterval = 30; lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim"; - xautolock.extraOptions = [ "Xautolock.killer: systemctl suspend" ]; + xautolock.extraOptions = [ "-killer 'systemctl suspend'" ]; }; } diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index a7c278f..c670933 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -2,7 +2,8 @@ imports = [ ({ inputs, lib, ... }: { nixpkgs = { config.allowUnfree = true; }; - nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs; + nix.registry = + lib.mkForce (lib.mapAttrs (_: value: { flake = value; }) inputs); }) ../../modules/security.nix ../../modules/common-system.nix diff --git a/modules/wm/x.nix b/modules/wm/x.nix index 0159bf6..cb669fb 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -8,9 +8,10 @@ xserver = { enable = true; - layout = "us"; - - xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt"; + xkb = { + options = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt"; + layout = "us"; + }; videoDrivers = [ "nvidia" ]; # "modesetting" ]; From 503df435a4a602d5152395069aa4baf55e0785be Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Tue, 12 Mar 2024 00:14:10 +0100 Subject: [PATCH 4/6] home(gpg): Fix issue related missing pinentry --- home/alex/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/alex/home.nix b/home/alex/home.nix index be61380..a1a3a3b 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -83,6 +83,9 @@ enable = true; enableSshSupport = true; sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ]; + extraConfig = '' + pinentry-program ${pkgs.pinentry.qt}/bin/pinentry + ''; }; # services.autorandr = { enable = true; }; From 8834987115b6031131964de4e1d49195ee5fab62 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Tue, 12 Mar 2024 00:14:37 +0100 Subject: [PATCH 5/6] home(doom): Use master branch of activities.el --- home/alex/programs/emacs/doom/packages.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el index d9480ae..153917b 100644 --- a/home/alex/programs/emacs/doom/packages.el +++ b/home/alex/programs/emacs/doom/packages.el @@ -69,5 +69,6 @@ (package! org-super-agenda) (package! org-ql) (package! org-bookmark-heading) -(package! activities) +(package! activities + :recipe (:host github :repo "alphapapa/activities.el" :branch "master")) (package! elfeed-web) From fd310dc33b9574a3d5170f0ac164d7c6675a4e9f Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Tue, 12 Mar 2024 00:22:20 +0100 Subject: [PATCH 6/6] dregil: Allow port 5223 for simplex desktop --- hosts/dregil/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index cd23964..186fa29 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -101,7 +101,7 @@ in { services.blueman.enable = true; # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; + networking.firewall.allowedTCPPorts = [ 5223 ]; # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false;