From e6372e5b36c61fec6c353fc8a6fd14d89131aac9 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Fri, 20 Oct 2023 12:40:57 +0200 Subject: [PATCH] Another batch of tiny improvements --- flake.lock | 54 +++++++++++++----------------------- flake.nix | 3 +- home-mods/dev/default.nix | 1 + home-mods/plasma/default.nix | 7 +++++ 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 0cb9523..0aa69ea 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697419184, - "narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=", + "lastModified": 1697721991, + "narHash": "sha256-Sjm7WaD+zLi9R7x8QKa9HGkizFQXvWGo18WlQtNPPtw=", "owner": "nix-community", "repo": "disko", - "rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2", + "rev": "c24c3a902935321e1dfa1ca587e66f47edf79faf", "type": "github" }, "original": { @@ -24,16 +24,18 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1697707800, - "narHash": "sha256-0FqCKVbDilWqM/+5YSo5de0lGBeCG5NRShpK8arLqIM=", + "lastModified": 1697769700, + "narHash": "sha256-ox9E90lRTKim6rb92kOfvqed+0jOmqgKpsAItsVdGdk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2e57d25ca0727155acd795d857f37932c457dbf7", + "rev": "7e236c963a46bc712971f9f6ff78f4ea50b64c0f", "type": "github" }, "original": { @@ -230,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697583813, - "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", + "lastModified": 1697655685, + "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", + "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", "type": "github" }, "original": { @@ -245,22 +247,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1697583813, - "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1673800717, "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", @@ -278,11 +264,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1697379843, - "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", + "lastModified": 1697730408, + "narHash": "sha256-Ww//zzukdTrwTrCUkaJA/NsaLEfUfQpWZXBdXBYfhak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", + "rev": "ff0a5a776b56e0ca32d47a4a47695452ec7f7d80", "type": "github" }, "original": { @@ -310,11 +296,11 @@ }, "nur": { "locked": { - "lastModified": 1697716025, - "narHash": "sha256-5gT33Zs2uGsiU43FNWN4GrRqNy/n+eOeGRapU9yy1Bs=", + "lastModified": 1697793907, + "narHash": "sha256-V2nTR/bN1GwozE2+Wz/YuuRq2uZhGo8HUSKCteJGQFs=", "owner": "nix-community", "repo": "NUR", - "rev": "9e80a4be10bd21688163db9b3d2c710e185a654e", + "rev": "d531cd7ef0001eaba84743d6666726df3c3b5620", "type": "github" }, "original": { @@ -358,7 +344,7 @@ "nix-wallpaper", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1675337566, diff --git a/flake.nix b/flake.nix index 8a11420..6ed1c28 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,8 @@ }; emacs-overlay = { url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; }; disko = { url = "github:nix-community/disko"; diff --git a/home-mods/dev/default.nix b/home-mods/dev/default.nix index 8e16aa5..7070bcc 100644 --- a/home-mods/dev/default.nix +++ b/home-mods/dev/default.nix @@ -51,6 +51,7 @@ gcc imagemagick libtool + nodejs_20 nil nixpkgs-fmt pandoc diff --git a/home-mods/plasma/default.nix b/home-mods/plasma/default.nix index b3e9a50..4e9c46f 100644 --- a/home-mods/plasma/default.nix +++ b/home-mods/plasma/default.nix @@ -37,6 +37,10 @@ "kwin"."Switch Window Left" = "Meta+Alt+Left"; "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; + "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; + "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; + "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; + "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; @@ -236,6 +240,9 @@ "kxkbrc"."Layout"."ResetOldOptions" = true; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; "plasmarc"."Wallpapers"."usersWallpapers" = ""; + "krunnerrc"."General"."FreeFloating" = true; + "kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."Image" = "/home/tristand/.background"; + "kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."PreviewImage" = "/home/tristand/.background"; }; }; }