diff --git a/SwarselSystems.org b/SwarselSystems.org index 900b9c5..a683057 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -4965,6 +4965,7 @@ Also, the system state version is set here. No need to touch it. nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" + "electron-29.4.6" ]; home-manager = { @@ -8559,7 +8560,7 @@ The rest of the settings is at [[#h:bbf2ecb6-c8ff-4462-b5d5-d45b28604ddf][work]] { home.packages = with pkgs; [ - teams-for-linux + stable.teams-for-linux google-chrome shellcheck dig diff --git a/flake.lock b/flake.lock index 177be34..a7dcf15 100644 --- a/flake.lock +++ b/flake.lock @@ -828,11 +828,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { diff --git a/index.html b/index.html index 324e40e..f2605a6 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + SwarselSystems: NixOS + Emacs Configuration @@ -350,7 +350,7 @@

-This file has 45507 words spanning 12037 lines and was last revised on 2024-08-27 23:41:55 +0200. +This file has 45632 words spanning 12064 lines and was last revised on 2024-08-31 18:00:48 +0200.

@@ -400,7 +400,7 @@ This section defines my Emacs configuration. For a while, I considered to use ry

-My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-08-27 23:41:55 +0200) +My emacs is built using the emacs-overlay nix flake, which builds a bleeding edge emacs on wayland (pgtk) with utilities like treesitter support. By executing the below source block, the current build setting can be updated at any time, and you can see my most up-to-date build options (last updated: 2024-08-31 18:00:48 +0200)

@@ -412,7 +412,7 @@ system-configuration-options 
---prefix=/nix/store/frxxsgm1rw0drr8la1cxm6cmq5iw89r0-emacs-pgtk-20240816.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --with-xwidgets --with-dbus --with-selinux
+--prefix=/nix/store/bjzr50zcpb5dqwybljizsvzs7pzx3jk5-emacs-pgtk-20240827.0 --disable-build-details --with-modules --with-pgtk --with-compress-install --with-toolkit-scroll-bars --with-native-compilation --without-imagemagick --with-mailutils --without-small-ja-dic --with-tree-sitter --without-xinput2 --with-xwidgets --with-dbus --with-selinux
@@ -2392,12 +2392,21 @@ My work machine. Built for more security, this is the gold standard of my config workspace = "1:一"; output = "DP-3"; }; - work_middle_middle = { + work_middle_middle_main = { name = "HP Inc. HP 732pk CNC4080YL5"; mode = "3840x2160"; scale = "1"; - position = "5120,0"; + position = "-1280,0"; workspace = "1:一"; + output = "DP-8"; + }; + work_middle_middle_side = { + name = "Hewlett Packard HP Z24i CN44250RDT"; + mode = "1920x1200"; + transform = "270"; + scale = "1"; + position = "-2480,0"; + workspace = "12:S"; output = "DP-9"; }; }; @@ -5723,6 +5732,7 @@ Also, the system state version is set here. No need to touch it. nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" + "electron-29.4.6" ]; home-manager = { @@ -5772,7 +5782,7 @@ This ensures that all user-configuration happens here in the config file. isNormalUser = true; description = "Leon S"; hashedPasswordFile = lib.mkIf (!config.swarselsystems.initialSetup) config.sops.secrets.swarseluser.path; - extraGroups = [ "networkmanager" "wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; + extraGroups = [ "networkmanager" "root" "docker""wheel" "lp" "audio" "video" "vboxusers" "scanner" ]; packages = with pkgs; [ ]; }; }; @@ -7294,11 +7304,20 @@ Integrates 1password mostly. There are more options at @@ -9155,7 +9174,7 @@ let }; eachOutput = _name: monitor: { inherit (monitor) name; - value = builtins.removeAttrs monitor [ "mode" "name" "scale" "position" ]; + value = builtins.removeAttrs monitor [ "mode" "name" "scale" "transform" "position" ]; }; workplaceSets = lib.mapAttrs' eachOutput monitors; workplaceOutputs = map (key: lib.getAttr key workplaceSets) (lib.attrNames workplaceSets); @@ -9224,6 +9243,10 @@ in "${modifier}+Shift+9" = "move container to workspace 9:九"; "${modifier}+0" = "workspace 10:十"; "${modifier}+Shift+0" = "move container to workspace 10:十"; + "${modifier}+Ctrl+m" = "workspace 11:M"; + "${modifier}+Ctrl+Shift+m" = "move container to workspace 11:M"; + "${modifier}+Ctrl+s" = "workspace 12:S"; + "${modifier}+Ctrl+Shift+s" = "move container to workspace 12:S"; "${modifier}+Left" = "focus left"; "${modifier}+Right" = "focus right"; "${modifier}+Down" = "focus down"; @@ -9541,10 +9564,11 @@ The rest of the settings is at dashboard, which is really quite useless. But, it

Author: Leon Schwarzäugl

-

Created: 2024-08-27 Di 23:42

+

Created: 2024-08-31 Sa 18:00

Validate

diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix index 04d71c7..3700531 100644 --- a/profiles/common/nixos/default.nix +++ b/profiles/common/nixos/default.nix @@ -58,6 +58,7 @@ nixpkgs.config.permittedInsecurePackages = [ "jitsi-meet-1.0.8043" + "electron-29.4.6" ]; home-manager = { diff --git a/profiles/optional/home/work.nix b/profiles/optional/home/work.nix index a5588a5..3fc0368 100644 --- a/profiles/optional/home/work.nix +++ b/profiles/optional/home/work.nix @@ -2,7 +2,7 @@ { home.packages = with pkgs; [ - teams-for-linux + stable.teams-for-linux google-chrome shellcheck dig