From 5c2fe80e1acc4c38db0b4180ec5168c8c194f22d Mon Sep 17 00:00:00 2001 From: KoenDR06 Date: Tue, 8 Oct 2024 14:34:16 +0200 Subject: [PATCH] Changes --- flake.lock | 24 ++++++++++++------------ home-manager/apps.nix | 1 + home-manager/nvim/neovim.nix | 4 ++++ home-manager/plasma.nix | 32 ++++++++++++++------------------ 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 13e046f..4515e23 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1726611255, - "narHash": "sha256-/bxaYvIK6/d3zqpW26QFS0rqfd0cO4qreSNWvYLTl/w=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2493de5cd1da06b6a4c3e97f4e7d5dd791df457", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1726509788, - "narHash": "sha256-PmCmO8NDKzwHrTp9Ox/rcLiCYivqIpZlnLk8wZRjv2I=", + "lastModified": 1727917089, + "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5a0c70a007837e2db01e0bb68971792e8653d32c", + "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1727734513, + "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "3198a242e547939c5e659353551b0668ec150268", "type": "github" }, "original": { diff --git a/home-manager/apps.nix b/home-manager/apps.nix index 84a9da1..e054a8f 100644 --- a/home-manager/apps.nix +++ b/home-manager/apps.nix @@ -72,6 +72,7 @@ sops spotify sxiv + termdown thunderbird tmux unzip diff --git a/home-manager/nvim/neovim.nix b/home-manager/nvim/neovim.nix index 7e9ad80..e878566 100644 --- a/home-manager/nvim/neovim.nix +++ b/home-manager/nvim/neovim.nix @@ -17,8 +17,12 @@ { plugin = pkgs.vimPlugins.lualine-nvim; config = lib.fileContents ./lualine.vim; + # Change icons so that lualine looks nice in tty } { plugin = pkgs.vimPlugins.neoscroll-nvim; } + # Save lsat cursor position + # When in normal mode, I have to press arrow right to make a new line. Bad. + # Clock in vim ]; }; } diff --git a/home-manager/plasma.nix b/home-manager/plasma.nix index 860ed4f..a213af2 100644 --- a/home-manager/plasma.nix +++ b/home-manager/plasma.nix @@ -9,7 +9,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; @@ -27,9 +27,7 @@ "ksmserver"."Reboot Without Confirmation" = [ ]; "ksmserver"."Shut Down" = [ ]; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; - "kwin"."ClearLastMouseMark" = "Meta+Shift+F12,none"; - "kwin"."ClearMouseMarks" = "Meta+Shift+F11,none"; - "kwin"."Cube" = "Meta+Ctrl+G,Meta+C,Toggle Cube"; + "kwin"."Cube" = "Meta+C,none,Toggle Cube"; "kwin"."Cycle Overview" = [ ]; "kwin"."Cycle Overview Opposite" = [ ]; "kwin"."Decrease Opacity" = [ ]; @@ -40,9 +38,7 @@ "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; "kwin"."Increase Opacity" = [ ]; - "kwin"."Invert" = "Meta+Ctrl+I\\, ,none"; "kwin"."Invert Screen Colors" = [ ]; - "kwin"."InvertWindow" = "Meta+Ctrl+U\\, ,none"; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."MinimizeAll" = [ ]; "kwin"."Move Tablet to Next Output" = [ ]; @@ -55,7 +51,6 @@ "kwin"."Overview" = "Meta+W"; "kwin"."Setup Window Shortcut" = [ ]; "kwin"."Show Desktop" = "Meta+D"; - "kwin"."Suspend Compositing" = "Alt+Shift+F12\\, ,none"; "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"; @@ -64,7 +59,7 @@ "kwin"."Switch Window Left" = "Meta+Alt+Left"; "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; - "kwin"."Switch to Desktop 1" = "\\, Ctrl+F1\\, ,Ctrl+F1,Switch to Desktop 1"; + "kwin"."Switch to Desktop 1" = "Ctrl+F1"; "kwin"."Switch to Desktop 10" = [ ]; "kwin"."Switch to Desktop 11" = [ ]; "kwin"."Switch to Desktop 12" = [ ]; @@ -75,10 +70,10 @@ "kwin"."Switch to Desktop 17" = [ ]; "kwin"."Switch to Desktop 18" = [ ]; "kwin"."Switch to Desktop 19" = [ ]; - "kwin"."Switch to Desktop 2" = "\\, Ctrl+F2\\, ,Ctrl+F2,Switch to Desktop 2"; + "kwin"."Switch to Desktop 2" = "Ctrl+F2"; "kwin"."Switch to Desktop 20" = [ ]; - "kwin"."Switch to Desktop 3" = "\\, Ctrl+F3\\, ,Ctrl+F3,Switch to Desktop 3"; - "kwin"."Switch to Desktop 4" = "\\, Ctrl+F4\\, ,Ctrl+F4,Switch to Desktop 4"; + "kwin"."Switch to Desktop 3" = "Ctrl+F3"; + "kwin"."Switch to Desktop 4" = "Ctrl+F4"; "kwin"."Switch to Desktop 5" = [ ]; "kwin"."Switch to Desktop 6" = [ ]; "kwin"."Switch to Desktop 7" = [ ]; @@ -118,7 +113,7 @@ "kwin"."Window Grow Horizontal" = [ ]; "kwin"."Window Grow Vertical" = [ ]; "kwin"."Window Lower" = [ ]; - "kwin"."Window Maximize" = ["Meta+PgUp" "Meta+Up,Meta+PgUp,Maximize Window"]; + "kwin"."Window Maximize" = "Meta+Up\\, Meta+PgUp\\, ,Meta+PgUp,Maximize Window"; "kwin"."Window Maximize Horizontal" = [ ]; "kwin"."Window Maximize Vertical" = [ ]; "kwin"."Window Minimize" = "Meta+PgDown"; @@ -132,8 +127,8 @@ "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; "kwin"."Window One Screen Down" = [ ]; "kwin"."Window One Screen Up" = [ ]; - "kwin"."Window One Screen to the Left" = [ ]; - "kwin"."Window One Screen to the Right" = [ ]; + "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left"; + "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right"; "kwin"."Window Operations Menu" = "Alt+F3"; "kwin"."Window Pack Down" = [ ]; "kwin"."Window Pack Left" = [ ]; @@ -144,7 +139,7 @@ "kwin"."Window Quick Tile Bottom Right" = [ ]; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; - "kwin"."Window Quick Tile Top" = "none,Meta+Up,Quick Tile Window to the Top"; + "kwin"."Window Quick Tile Top" = "\\, Meta+Up\\, ,Meta+Up,Quick Tile Window to the Top"; "kwin"."Window Quick Tile Top Left" = [ ]; "kwin"."Window Quick Tile Top Right" = [ ]; "kwin"."Window Raise" = [ ]; @@ -187,7 +182,7 @@ "kwin"."view_actual_size" = ",Meta+0,Zoom to Actual Size"; "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; - "mediacontrol"."mediavolumedown" = "\\, ,,Media volume down"; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; "mediacontrol"."mediavolumeup" = [ ]; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; @@ -210,7 +205,7 @@ "org_kde_powerdevil"."powerProfile" = ["Battery" "" "Meta+B\\, ,Battery" "Meta+B,Switch Power Profile"]; "plasmashell"."activate application launcher" = ["Meta" "" "Alt+F1\\, ,Meta" "Alt+F1,Activate Application Launcher"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = "Meta+0"; + "plasmashell"."activate task manager entry 10" = "\\, Meta+0\\, ,Meta+0,Activate Task Manager Entry 10"; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -219,7 +214,7 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = [ ]; + "plasmashell"."clear-history" = "\\, ,,Clear Clipboard History"; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; "plasmashell"."cycleNextAction" = [ ]; @@ -297,6 +292,7 @@ "kcminputrc"."Libinput/1267/12432/ELAN1200:00 04F3:3090 Touchpad"."ClickMethod" = 2; "kcminputrc"."Libinput/1267/12432/ELAN1200:00 04F3:3090 Touchpad"."Enabled" = true; "kcminputrc"."Libinput/1267/12432/ELAN1200:00 04F3:3090 Touchpad"."ScrollFactor" = 0.3; + "kcminputrc"."Libinput/1267/12432/ELAN1200:00 04F3:3090 Touchpad"."ScrollMethod" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false;