diff --git a/flake.lock b/flake.lock index ecf7c0d..3b57d1d 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -107,7 +107,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1709126324, @@ -125,7 +125,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -143,7 +143,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -160,21 +160,17 @@ } }, "flatpaks": { - "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" - }, "locked": { - "lastModified": 1707326266, - "narHash": "sha256-vRVih6iltuyLdj305Pj236BfhzFaOkAbHg3r5VsFdxs=", - "owner": "GermanBread", - "repo": "declarative-flatpak", - "rev": "efe7897ddcfbca085fba0690b3094e7f8e8911dd", + "lastModified": 1708781964, + "narHash": "sha256-qbEZgB1mNuMADLmM64EtcRjDHXR3UFL4xVmoanv9wZU=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "09d07c73b4d9771f527a168e0b1b6d8a1f39de28", "type": "github" }, "original": { - "owner": "GermanBread", - "repo": "declarative-flatpak", + "owner": "gmodena", + "repo": "nix-flatpak", "type": "github" } }, @@ -210,11 +206,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709650834, - "narHash": "sha256-bMvguV+1TuKksZB29JUbSn+RyhU8t0Z4cvfYuyZy8K8=", + "lastModified": 1710717088, + "narHash": "sha256-IYIRPF3UxBo70WKHVCqDFO11x6AT6OUVt2oncP8ARIY=", "owner": "helix-editor", "repo": "helix", - "rev": "3f98891e7952a748f814e6741f4375c9b7aa0983", + "rev": "476e6baf8f664bb08114aa5bf6bc839925d8d329", "type": "github" }, "original": { @@ -230,11 +226,11 @@ ] }, "locked": { - "lastModified": 1709677162, - "narHash": "sha256-nIXa0KM3FOVjD3XDDigW12qktQvLG+uKuPg00rjIX/8=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdea159ffab9865f808b8d92fd2bef33521867b2", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -288,11 +284,11 @@ ] }, "locked": { - "lastModified": 1709435391, - "narHash": "sha256-s4itTkIVxn5lYeTzwkbAgl99atnjdZv1idI1118vdzA=", + "lastModified": 1710644923, + "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "93554c04c2f1c02f4a383538e8848d511c3129e9", + "rev": "e25efda85e39fcdc845e371971ac4384989c4295", "type": "github" }, "original": { @@ -363,14 +359,14 @@ "nixd": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707749130, - "narHash": "sha256-GGcLEg546mjyQbUzbd/z79sGHPK8jYbQKeHrbl8Zb/U=", + "lastModified": 1710553072, + "narHash": "sha256-g80GlUrlCdHQVaJq9r8myCIzLmQp59e6jiGfxkodNYo=", "owner": "nix-community", "repo": "nixd", - "rev": "548226eca2994b2e9e1592c6910410b4a2d0575c", + "rev": "a436786fbd8ed5aafea4b0512cb1170a6e0e39df", "type": "github" }, "original": { @@ -381,16 +377,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -413,11 +409,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -462,27 +458,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1681303793, - "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", + "lastModified": 1710097495, + "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", "type": "github" }, "original": { @@ -492,13 +472,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -508,7 +488,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1708294118, "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=", @@ -526,11 +506,11 @@ }, "nur": { "locked": { - "lastModified": 1709682267, - "narHash": "sha256-mz2e9xwa51EygswhROl2mlRakameMFbBuVQmdFT5lbA=", + "lastModified": 1710715532, + "narHash": "sha256-1KgI1DhDQGQe2Q25ckZN4CKrGtASJ7lC98naP4Frm+I=", "owner": "nix-community", "repo": "NUR", - "rev": "db764ae1d6a0a43676d67bcb7d122338f466c377", + "rev": "6e59126223880775fe33c9115d135bdb345efbe3", "type": "github" }, "original": { @@ -542,14 +522,14 @@ "plasma-manager": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1709634318, - "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=", + "lastModified": 1709982472, + "narHash": "sha256-cMPHIV7yWbve+nwiQDhVt7BBkxrGTLzSTAslv7u6HZo=", "owner": "pjones", "repo": "plasma-manager", - "rev": "9bac5925cf7716979535eed9c88e307fa9744169", + "rev": "26acf8f5880ae7d6e5de4ca953c8ad161b7903eb", "type": "github" }, "original": { @@ -566,7 +546,7 @@ "flake-utils" ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -594,7 +574,7 @@ "nix-rice": "nix-rice", "nix-std": "nix-std", "nixd": "nixd", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", "plasma-manager": "plasma-manager", @@ -636,11 +616,11 @@ ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1710641527, + "narHash": "sha256-R9JZEevtSyg7++LEryYJRrfyEe45azJxmu2k9VezEW0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "50db54295d3922a3b7a40d580b84d75150b36c34", "type": "github" }, "original": { @@ -708,39 +688,6 @@ "repo": "default", "type": "github" } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ef5431b..adf9924 100644 --- a/flake.nix +++ b/flake.nix @@ -43,9 +43,7 @@ plasma-manager.url = "github:pjones/plasma-manager"; - flatpaks.url = "github:GermanBread/declarative-flatpak"; - - # atuin.url = "github:atuinsh/atuin"; + flatpaks.url = "github:gmodena/nix-flatpak"; }; outputs = { @@ -57,7 +55,6 @@ helix, plasma-manager, flatpaks, - # atuin, nixd, nix-ld-rs, nix-index-database, @@ -86,7 +83,7 @@ home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.users.bolt.imports = [ - flatpaks.homeManagerModules.default + flatpaks.homeManagerModules.nix-flatpak ./home/bolt.nix ]; } @@ -105,7 +102,10 @@ { home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = {inherit inputs outputs;}; - home-manager.users.plank.imports = [./home/plank.nix]; + home-manager.users.plank.imports = [ + flatpaks.homeManagerModules.nix-flatpak + ./home/plank.nix + ]; } ]; }; diff --git a/home/home.nix b/home/home.nix index 55e848b..1fdc814 100644 --- a/home/home.nix +++ b/home/home.nix @@ -58,6 +58,8 @@ in { xorg.xrdb culr + tuxguitar + # kdeconnect plasma-browser-integration keepassxc @@ -69,21 +71,6 @@ in { gtk-engine-murrine plasma5Packages.polonium - # ( - # (plasma5Packages.polonium.override {}).overrideAttrs - # (old: { - # version = "1.0.0-alpha"; - - # src = fetchFromGitHub { - # owner = "zeroxoneafour"; - # repo = "polonium"; - # rev = "94ba0faac40d2fbccebdb34bb4f7d6c7d162396f"; - # hash = "sha256-uoL3GfGTj/rIQdWuBY0dBdEurkusSGF8YRnUS3gtvnQ="; - # }; - - # npmDepsHash = "sha256-kaT3Uyq+/JkmebakG9xQuR4Kjo7vk6BzI1/LffOj/eo="; - # }) - # ) ] ++ pkgs.rice.fonts.pkgs ++ pkgs.rice.icons.pkgs; @@ -104,35 +91,38 @@ in { services.udiskie.enable = true; services.flatpak = { - enableModule = true; + enable = true; + uninstallUnmanagedPackages = true; + update.auto.enable = true; packages = [ - "flathub:app/com.logseq.Logseq/x86_64/stable" - "flathub:app/md.obsidian.Obsidian/x86_64/stable" - "flathub:app/org.onlyoffice.desktopeditors/x86_64/stable" + "com.logseq.Logseq" + "md.obsidian.Obsidian" + "org.onlyoffice.desktopeditors" ]; - remotes = { - "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - # "flathub-beta" = "https://dl.flathub.org/beta-repo/flathub-beta.flatpakrepo"; - }; overrides = { - "global" = { - sockets = ["wayland"]; - environment = { - "ELECTRON_OZONE_PLATFORM_HINT" = "auto"; + global = { + Context.sockets = ["wayland"]; + Environment = { + ELECTRON_OZONE_PLATFORM_HINT = "auto"; + }; + }; + "md.obsidian.Obsidian" = { + Environment = { + OBSIDIAN_DISABLE_GPU = "1"; }; }; }; }; programs.firefox.webapps = { - "Microsoft Teams" = { + "Microsoft-Teams" = { url = "https://teams.microsoft.com"; id = 1; extraSettings = config.programs.firefox.profiles.default.settings; name = "Microsoft Teams"; icon = ./icons/ms_teams.png; }; - "Facebook Messenger" = { + "Facebook-Messenger" = { url = "https://www.messenger.com"; id = 2; extraSettings = config.programs.firefox.profiles.default.settings; @@ -151,8 +141,14 @@ in { programs.atuin = { enable = true; enableZshIntegration = true; - # flags = ["--disable-up-arrow"]; - # package = inputs.atuin; + settings = { + inline_height = 20; + show_preview = true; + show_help = false; + enter_accept = false; + keymap_mode = "vim-normal"; + style = "compact"; + }; }; # programs.nix-index-database.comma.enable = true; # programs.nix-index = { @@ -254,16 +250,16 @@ in { }; }; - programs.fzf = { - enable = true; - enableZshIntegration = true; - colors = with palette-hex; { - fg = util.fg; - bg = util.bg; - hl = util.bg_sel; - "fg+" = util.fg_sel; - "bg+" = util.bg_sel; - "hl+" = bright.green; - }; - }; + # programs.fzf = { + # enable = true; + # enableZshIntegration = true; + # colors = with palette-hex; { + # fg = util.fg; + # bg = util.bg; + # hl = util.bg_sel; + # "fg+" = util.fg_sel; + # "bg+" = util.bg_sel; + # "hl+" = bright.green; + # }; + # }; } diff --git a/home/programs/plasma.nix b/home/programs/plasma.nix index 1a8f6eb..a96ab5f 100644 --- a/home/programs/plasma.nix +++ b/home/programs/plasma.nix @@ -73,7 +73,7 @@ "kwin"."PoloniumResizeTileRight" = [ ]; "kwin"."PoloniumResizeTileUp" = [ ]; "kwin"."PoloniumRetileWindow" = "Meta+Space"; - "kwin"."PoloniumShowSettings" = "Meta+\\,none"; + "kwin"."PoloniumShowSettings" = "Meta+/"; "kwin"."PoloniumSwapAbove" = [ ]; "kwin"."PoloniumSwapBelow" = [ ]; "kwin"."PoloniumSwapLeft" = [ ]; @@ -300,8 +300,8 @@ "kactivitymanagerdrc"."activities"."8e94f782-b970-49f5-80e1-19c9cf6c8a88" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "8e94f782-b970-49f5-80e1-19c9cf6c8a88"; "kcminputrc"."Keyboard"."NumLock" = 0; - "kcminputrc"."Libinput.6940.7005.ckb2: CORSAIR IRONCLAW RGB Gaming Mouse vM"."PointerAcceleration" = 0.0; - "kcminputrc"."Libinput.6940.7005.ckb2: CORSAIR IRONCLAW RGB Gaming Mouse vM"."PointerAccelerationProfile" = 1; + "kcminputrc"."Libinput"."6940"."7005"."ckb2: CORSAIR IRONCLAW RGB Gaming Mouse vM"."PointerAcceleration" = 0.0; + "kcminputrc"."Libinput"."6940"."7005"."ckb2: CORSAIR IRONCLAW RGB Gaming Mouse vM"."PointerAccelerationProfile" = 1; "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true; "kcminputrc"."Mouse"."cursorTheme" = "breeze_cursors"; "kcminputrc"."Tmp"."update_info" = "delete_cursor_old_default_size.upd:DeleteCursorOldDefaultSize"; @@ -333,7 +333,7 @@ "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."XftHintStyle" = "hintslight"; "kdeglobals"."General"."XftSubPixel" = "none"; - "kdeglobals"."General"."fixed" = "MesloLGS NF,9,-1,5,50,0,0,0,0,0"; + "kdeglobals"."General"."fixed" = "Fira Code,9,-1,5,50,0,0,0,0,0"; "kdeglobals"."General"."font" = "Inria Sans,10,-1,5,50,0,0,0,0,0"; "kdeglobals"."General"."menuFont" = "Inria Sans,10,-1,5,50,0,0,0,0,0"; "kdeglobals"."General"."smallestReadableFont" = "Inria Sans,8,-1,5,50,0,0,0,0,0"; @@ -920,7 +920,16 @@ "khotkeysrc"."WM"."inactiveBlend[$d]" = ""; "khotkeysrc"."WM"."inactiveForeground[$d]" = ""; "kiorc"."Confirmations"."ConfirmDelete" = true; + "krunnerrc"."Plugins"."DictionaryEnabled" = false; "krunnerrc"."Plugins"."baloosearchEnabled" = false; + "krunnerrc"."Plugins"."bookmarksEnabled" = false; + "krunnerrc"."Plugins"."browserhistoryEnabled" = false; + "krunnerrc"."Plugins"."browsertabsEnabled" = false; + "krunnerrc"."Plugins"."desktopsessionsEnabled" = false; + "krunnerrc"."Plugins"."katesessionsEnabled" = false; + "krunnerrc"."Plugins"."konsoleprofilesEnabled" = false; + "krunnerrc"."Plugins"."org.kde.activities2Enabled" = false; + "krunnerrc"."Plugins"."webshortcutsEnabled" = false; "ksmserverrc"."General"."loginMode" = "emptySession"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "0e89fa04-26c8-461f-8349-2713d84f6daa"; @@ -968,21 +977,23 @@ "kwinrc"."Script-polonium"."Unfullscreen" = true; "kwinrc"."TabBox"."LayoutName" = "compact"; "kwinrc"."Tiling"."padding" = 4; - "kwinrc"."Tiling.0e03a935-d467-5008-ac02-2d49bd489fa5"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; - "kwinrc"."Tiling.1146a6ac-0683-568b-a352-d8ca7470eab6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; - "kwinrc"."Tiling.5b7fa715-9e22-58f3-9fa5-60878e126c62"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; - "kwinrc"."Tiling.7cee4d9c-0c6a-5563-91f4-7c81d68172ce"."tiles" = "{\"layoutDirection\":\"vertical\",\"tiles\":[]}"; - "kwinrc"."Tiling.f726f7e7-1cfe-5dd0-933b-15892472fe80"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; - "kwinrc"."Tiling.fec5a356-f9de-520a-8d72-a01616b3b699"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."0e03a935-d467-5008-ac02-2d49bd489fa5"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."1146a6ac-0683-568b-a352-d8ca7470eab6"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."5b7fa715-9e22-58f3-9fa5-60878e126c62"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."7cee4d9c-0c6a-5563-91f4-7c81d68172ce"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."f726f7e7-1cfe-5dd0-933b-15892472fe80"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; + "kwinrc"."Tiling"."fec5a356-f9de-520a-8d72-a01616b3b699"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[]}"; "kwinrc"."Wayland"."EnablePrimarySelection" = false; "kwinrc"."Windows"."ActiveMouseScreen" = false; "kwinrc"."Windows"."DelayFocusInterval" = 100; "kwinrc"."Windows"."ElectricBorderMaximize" = false; "kwinrc"."Windows"."ElectricBorderTiling" = false; "kwinrc"."Windows"."FocusPolicy" = "FocusFollowsMouse"; + "kwinrc"."Windows"."FocusStealingPreventionLevel" = 0; + "kwinrc"."Windows"."NextFocusPrefersMouse" = true; "kwinrc"."Xwayland"."Scale" = 1; - "kwinrc"."org.kde.kdecoration2"."BorderSize" = "NoSides"; - "kwinrc"."org.kde.kdecoration2"."BorderSizeAuto" = false; + "kwinrc"."org"."kde"."kdecoration2"."BorderSize" = "NoSides"; + "kwinrc"."org"."kde"."kdecoration2"."BorderSizeAuto" = false; "kwinrulesrc"."1"."Description" = "force titlebar/frame"; "kwinrulesrc"."1"."noborderrule" = 2; "kwinrulesrc"."1"."types" = 1; diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index bcc90ea..e33c93c 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -9,7 +9,7 @@ in { programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; syntaxHighlighting.enable = true; enableVteIntegration = true; diff --git a/system/configuration.nix b/system/configuration.nix index c158711..33d55d8 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -78,20 +78,27 @@ #input stuff - services.xserver.xkb.options = "caps:escape"; - services.xserver.xkb.layout = "us"; - services.xserver.libinput.enable = true; + services.xserver = { + enable = false; # SDDM requires this - maybe not with wayland setting? + xkb.options = "caps:escape"; + xkb.layout = "us"; + libinput.enable = true; + + desktopManager.plasma5 = { + enable = true; + # enableQt5Integration = true; + runUsingSystemd = true; + }; + + displayManager.sddm = { + wayland.enable = true; # for plasma 6 + enable = true; + }; + displayManager.defaultSession = "plasma"; + }; services.udisks2.enable = true; - services.xserver.enable = true; # SDDM requires this - services.xserver.desktopManager.plasma5 = { - enable = true; - # enableQt5Integration = true; - runUsingSystemd = true; - }; - services.xserver.displayManager.sddm.enable = true; - services.xserver.displayManager.defaultSession = "plasma"; environment.plasma5.excludePackages = with pkgs.libsForQt5; [ konsole gwenview @@ -135,7 +142,6 @@ man-pages man-pages-posix - rnix-lsp nixd home-manager diff --git a/system/quiver.nix b/system/quiver.nix index d570e4a..2236a60 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -76,11 +76,13 @@ }; services.xserver.videoDrivers = ["nvidia"]; + services.xserver.displayManager.autoLogin.user = "bolt"; hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.stable; modesetting.enable = true; powerManagement.enable = true; open = false; + nvidiaPersistenced = true; }; programs.xwayland.enable = true; diff --git a/update.sh b/update.sh deleted file mode 100755 index 03ccbcb..0000000 --- a/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -descend() { - for f in $1/*; do - if [[ -d $f ]]; then - echo descending into $f... - descend $f - fi - done - if [[ -d $1 ]]; then - echo updating $1... - nix flake update - sleep 5 # prevent api thrashing - fi -} - -descend flakes -nix flake update