diff --git a/nixos/configuration.nix b/nixos/configuration.nix index f97d8b0..5fb51ce 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -15,19 +15,19 @@ nix.settings.experimental-features = ["nix-command" "flakes"]; programs.nix-ld.dev.enable = true; - # Bootloader. - boot.loader.systemd-boot.enable = true; - home-manager = { extraSpecialArgs = {inherit inputs pkgs pkgs-stable username;}; backupFileExtension = "backup"; users = { ${username} = import ./home.nix; }; + sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager]; }; + # Bootloader. + boot.loader.systemd-boot.enable = true; + environment.sessionVariables = { - EDITOR = "nvim"; FLAKE = "/home/${username}/dotfiles"; DEFAULT_BROWSER = "${pkgs.librewolf}/bin/librewolf"; diff --git a/nixos/desktop/desktops.nix b/nixos/desktop/desktops.nix index 7694191..30b5116 100644 --- a/nixos/desktop/desktops.nix +++ b/nixos/desktop/desktops.nix @@ -2,5 +2,6 @@ { imports = [ ./hyprland/hyprland.nix + ./kde/kde.nix ]; } \ No newline at end of file diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix index 36dcf36..a73c185 100644 --- a/nixos/desktop/hyprland/hyprland.nix +++ b/nixos/desktop/hyprland/hyprland.nix @@ -36,7 +36,7 @@ pkgs.toybox ]; - environment.sessionVariables = { + home.sessionVariables = { WLR_NO_HARDWARE_CURSORS = "1"; NIXOS_OZONE_WL = "1"; }; @@ -113,7 +113,7 @@ "XDG_SESSION_TYPE,wayland" "XDG_SESSION_DESKTOP,Hyprland" "QT_QPA_PLATFORM,wayland;xcb" - "QT_QPA_PLATFORMTHEME,qt6ct" + #"QT_QPA_PLATFORMTHEME,qt6ct" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "QT_AUTO_SCREEN_SCALE_FACTOR,1" "MOZ_ENABLE_WAYLAND,1" @@ -128,7 +128,7 @@ "discord --start-minimized" "vesktop --start-minimized" "${pkgs.ferdium}/bin/ferdium --minimized" - "${pkgs.plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator" + "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator" "systemctl --user start hyprpolkitagent" #"swww-daemon --format xrgb" diff --git a/nixos/desktop/hyprland/packages.nix b/nixos/desktop/hyprland/packages.nix index 3c43c6f..e45e161 100644 --- a/nixos/desktop/hyprland/packages.nix +++ b/nixos/desktop/hyprland/packages.nix @@ -82,6 +82,6 @@ ]) ++ (with pkgs-stable; [ pavucontrol - gnome.nautilus + nautilus ]); } diff --git a/nixos/desktop/kde/kde.nix b/nixos/desktop/kde/kde.nix index e69de29..955e4ea 100644 --- a/nixos/desktop/kde/kde.nix +++ b/nixos/desktop/kde/kde.nix @@ -0,0 +1,340 @@ +{...}: { + programs.plasma = { + enable = true; + + shortcuts = { + "ActivityManager"."switch-to-activity-5d67a9cf-0b1a-40b0-a629-e97ffd67fb5d" = []; + "KDE Keyboard Layout Switcher"."Switch keyboard layout to Czech" = []; + "KDE Keyboard Layout Switcher"."Switch keyboard layout to English (US)" = []; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Alt+Shift,Meta+Alt+K,Switch to Next Keyboard Layout"; + "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"]; + "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; + "kmix"."decrease_volume" = "Volume Down"; + "kmix"."decrease_volume_small" = "Shift+Volume Down"; + "kmix"."increase_microphone_volume" = "Microphone Volume Up"; + "kmix"."increase_volume" = "Volume Up"; + "kmix"."increase_volume_small" = "Shift+Volume Up"; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mute" = "Volume Mute"; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; + "ksmserver"."Lock Session" = ["Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Log Out" = "Ctrl+Alt+Del"; + "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; + "ksmserver"."LogOut" = "none,,Log Out"; + "ksmserver"."Reboot" = "none,,Reboot"; + "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; + "ksmserver"."Shut Down" = "none,,Shut Down"; + "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; + "kwin"."Edit Tiles" = "none,Meta+T,Toggle Tiles Editor"; + "kwin"."Expose" = "Ctrl+F9"; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = []; + "kwin"."Grid View" = "none,Meta+G,Toggle Grid View"; + "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = []; + "kwin"."MoveMouseToCenter" = "Meta+F6"; + "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; + "kwin"."Overview" = "Meta+W"; + "kwin"."PoloniumCycleEngine" = "Meta+|,none,Polonium: Cycle Engine"; + "kwin"."PoloniumFocusAbove" = "Meta+K,none,Polonium: Focus Above"; + "kwin"."PoloniumFocusBelow" = "Meta+J,none,Polonium: Focus Below"; + "kwin"."PoloniumFocusLeft" = "Meta+H,none,Polonium: Focus Left"; + "kwin"."PoloniumFocusRight" = []; + "kwin"."PoloniumInsertAbove" = "Meta+Shift+K,none,Polonium: Insert Above"; + "kwin"."PoloniumInsertBelow" = "Meta+Shift+J,none,Polonium: Insert Below"; + "kwin"."PoloniumInsertLeft" = "Meta+Shift+H,none,Polonium: Insert Left"; + "kwin"."PoloniumInsertRight" = "Meta+Shift+L,none,Polonium: Insert Right"; + "kwin"."PoloniumOpenSettings" = "Meta+\\\\,none,Polonium: Open Settings Dialog"; + "kwin"."PoloniumResizeAbove" = "Meta+Ctrl+K,none,Polonium: Resize Above"; + "kwin"."PoloniumResizeBelow" = "Meta+Ctrl+J,none,Polonium: Resize Below"; + "kwin"."PoloniumResizeLeft" = "Meta+Ctrl+H,none,Polonium: Resize Left"; + "kwin"."PoloniumResizeRight" = "Meta+Ctrl+L,none,Polonium: Resize Right"; + "kwin"."PoloniumRetileWindow" = "Meta+Shift+Space,none,Polonium: Retile Window"; + "kwin"."PoloniumSwitchBTree" = []; + "kwin"."PoloniumSwitchHalf" = []; + "kwin"."PoloniumSwitchKwin" = []; + "kwin"."PoloniumSwitchMonocle" = []; + "kwin"."PoloniumSwitchThreeColumn" = []; + "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Show Desktop" = "Meta+D"; + "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 Window Down" = "Meta+Alt+Down"; + "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" = ["Meta+1" "Ctrl+F1,Ctrl+F1,Switch to Desktop 1"]; + "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10"; + "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11"; + "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12"; + "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13"; + "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14"; + "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15"; + "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16"; + "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17"; + "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18"; + "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19"; + "kwin"."Switch to Desktop 2" = ["Meta+2" "Ctrl+F2,Ctrl+F2,Switch to Desktop 2"]; + "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20"; + "kwin"."Switch to Desktop 3" = ["Ctrl+F3" "Meta+3,Ctrl+F3,Switch to Desktop 3"]; + "kwin"."Switch to Desktop 4" = ["Meta+4" "Ctrl+F4,Ctrl+F4,Switch to Desktop 4"]; + "kwin"."Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5"; + "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6"; + "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7"; + "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8"; + "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9"; + "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop"; + "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen"; + "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop"; + "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen"; + "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0"; + "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1"; + "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2"; + "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3"; + "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4"; + "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5"; + "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6"; + "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7"; + "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above"; + "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below"; + "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left"; + "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right"; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower"; + "kwin"."Walk Through Windows" = "Alt+Tab"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; + "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative"; + "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)"; + "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative"; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)"; + "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others"; + "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others"; + "kwin"."Window Close" = ["Meta+Q" "Alt+F4,Alt+F4,Close Window"]; + "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen"; + "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally"; + "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically"; + "kwin"."Window Lower" = "none,,Lower Window"; + "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; + "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; + "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = "none,,Move Window"; + "kwin"."Window Move Center" = "none,,Move Window to the Center"; + "kwin"."Window No Border" = "Meta+G,,Toggle Window Titlebar and Frame"; + "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops"; + "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; + "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; + "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; + "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down"; + "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up"; + "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" = "none,,Move Window Down"; + "kwin"."Window Pack Left" = "none,,Move Window Left"; + "kwin"."Window Pack Right" = "none,,Move Window Right"; + "kwin"."Window Pack Up" = "none,,Move Window Up"; + "kwin"."Window Quick Tile Bottom" = "none,Meta+Down,Quick Tile Window to the Bottom"; + "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left"; + "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the 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 Left" = "none,,Quick Tile Window to the Top Left"; + "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right"; + "kwin"."Window Raise" = "none,,Raise Window"; + "kwin"."Window Resize" = "none,,Resize Window"; + "kwin"."Window Shade" = "none,,Shade Window"; + "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally"; + "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically"; + "kwin"."Window to Desktop 1" = "Meta+!,,Window to Desktop 1"; + "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10"; + "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11"; + "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12"; + "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13"; + "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14"; + "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15"; + "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16"; + "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17"; + "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18"; + "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19"; + "kwin"."Window to Desktop 2" = "Meta+@,,Window to Desktop 2"; + "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20"; + "kwin"."Window to Desktop 3" = "Meta+#,,Window to Desktop 3"; + "kwin"."Window to Desktop 4" = "Meta+$,,Window to Desktop 4"; + "kwin"."Window to Desktop 5" = "none,,Window to Desktop 5"; + "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6"; + "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7"; + "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8"; + "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9"; + "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop"; + "kwin"."Window to Next Screen" = "Meta+Shift+Right"; + "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; + "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; + "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0"; + "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1"; + "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2"; + "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3"; + "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4"; + "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5"; + "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; + "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; + "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = "none,,Media volume down"; + "mediacontrol"."mediavolumeup" = "none,,Media volume up"; + "mediacontrol"."nextmedia" = "Media Next"; + "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = "none,,Play media playback"; + "mediacontrol"."playpausemedia" = "Media Play"; + "mediacontrol"."previousmedia" = "Media Previous"; + "mediacontrol"."stopmedia" = "Media Stop"; + "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; + "org_kde_powerdevil"."Hibernate" = "Hibernate"; + "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; + "org_kde_powerdevil"."PowerDown" = "Power Down"; + "org_kde_powerdevil"."PowerOff" = "Power Off"; + "org_kde_powerdevil"."Sleep" = "Sleep"; + "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; + "org_kde_powerdevil"."Turn Off Screen" = []; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; + "plasmashell"."activate application launcher" = ["Meta,Meta" "Alt+F1,Activate Application Launcher"]; + "plasmashell"."activate task manager entry 1" = "none,Meta+1,Activate Task Manager Entry 1"; + "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 2" = "none,Meta+2,Activate Task Manager Entry 2"; + "plasmashell"."activate task manager entry 3" = "none,Meta+3,Activate Task Manager Entry 3"; + "plasmashell"."activate task manager entry 4" = "none,Meta+4,Activate Task Manager Entry 4"; + "plasmashell"."activate task manager entry 5" = "none,Meta+5,Activate Task Manager Entry 5"; + "plasmashell"."activate task manager entry 6" = "Meta+6"; + "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" = "none,,Clear Clipboard History"; + "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; + "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = "none,,Next History Item"; + "plasmashell"."cyclePrevAction" = "none,,Previous History Item"; + "plasmashell"."manage activities" = "none,Meta+Q,Show Activity Switcher"; + "plasmashell"."next activity" = []; + "plasmashell"."previous activity" = "Meta+Shift+A,none,Walk through activities (Reverse)"; + "plasmashell"."repeat_action" = "none,Meta+Ctrl+R,Manually Invoke Action on Current Clipboard"; + "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = "none,,Show Barcode…"; + "plasmashell"."show-on-mouse-pos" = "Meta+V"; + "plasmashell"."stop current activity" = "Meta+S"; + "plasmashell"."switch to next activity" = "none,,Switch to Next Activity"; + "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity"; + "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb"; + "services/code.desktop"."_launch" = "Meta+C"; + "services/kitty.desktop"."_launch" = "Meta+T"; + "services/librewolf.desktop"."_launch" = "Meta+F"; + "services/org.kde.krunner.desktop"."_launch" = ["Meta+A" "Alt+F2" "Alt+Space" "Search"]; + "services/org.kde.plasma-systemmonitor.desktop"."_launch" = []; + }; + configFile = { + "baloofilerc"."General"."dbVersion" = 2; + "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.tfstate*,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.terraform,.venv,venv,core-dumps,lost+found"; + "baloofilerc"."General"."exclude filters version" = 9; + "kactivitymanagerdrc"."activities"."5d67a9cf-0b1a-40b0-a629-e97ffd67fb5d" = "Default"; + "kactivitymanagerdrc"."main"."currentActivity" = "5d67a9cf-0b1a-40b0-a629-e97ffd67fb5d"; + "kcminputrc"."Libinput/1267/12739/ELAN050B:00 04F3:31C3 Touchpad"."Enabled" = true; + "kded5rc"."Module-device_automounter"."autoload" = false; + "kdeglobals"."General"."TerminalApplication" = "kitty"; + "kdeglobals"."General"."TerminalService" = "kitty.desktop"; + "kdeglobals"."KDE"."ShowDeleteCommand" = false; + "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; + "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; + "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true; + "kdeglobals"."KFileDialog Settings"."Decoration position" = 2; + "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5; + "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false; + "kdeglobals"."KFileDialog Settings"."Show Full Path" = false; + "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true; + "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true; + "kdeglobals"."KFileDialog Settings"."Show hidden files" = false; + "kdeglobals"."KFileDialog Settings"."Sort by" = "Name"; + "kdeglobals"."KFileDialog Settings"."Sort directories first" = true; + "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false; + "kdeglobals"."KFileDialog Settings"."Sort reversed" = false; + "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 145; + "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."PreviewSettings"."EnableRemoteFolderThumbnail" = false; + "kdeglobals"."PreviewSettings"."MaximumRemoteSize" = 0; + "kdeglobals"."WM"."activeBackground" = "30,30,46"; + "kdeglobals"."WM"."activeBlend" = "249,226,175"; + "kdeglobals"."WM"."activeForeground" = "205,214,244"; + "kdeglobals"."WM"."inactiveBackground" = "30,30,46"; + "kdeglobals"."WM"."inactiveBlend" = "69,71,90"; + "kdeglobals"."WM"."inactiveForeground" = "205,214,244"; + "kiorc"."Confirmations"."ConfirmDelete" = true; + "kiorc"."Confirmations"."ConfirmEmptyTrash" = true; + "kiorc"."Confirmations"."ConfirmTrash" = false; + "kiorc"."Executable scripts"."behaviourOnLaunch" = "alwaysAsk"; + "krunnerrc"."General"."FreeFloating" = true; + "kscreenlockerrc"."Daemon"."Timeout" = 20; + "kservicemenurc"."Show"."forgetfileitemaction" = true; + "kservicemenurc"."Show"."installFont" = true; + "kservicemenurc"."Show"."kactivitymanagerd_fileitem_linking_plugin" = true; + "kservicemenurc"."Show"."kdeconnectfileitemaction" = true; + "kservicemenurc"."Show"."kio-admin" = true; + "kservicemenurc"."Show"."makefileactions" = true; + "kservicemenurc"."Show"."mountisoaction" = true; + "kservicemenurc"."Show"."movetonewfolderitemaction" = true; + "kservicemenurc"."Show"."tagsfileitemaction" = true; + "kservicemenurc"."Show"."wallpaperfileitemaction" = true; + "ktrashrc"."\\/home\\/foglar\\/.local\\/share\\/Trash"."Days" = 7; + "ktrashrc"."\\/home\\/foglar\\/.local\\/share\\/Trash"."LimitReachedAction" = 0; + "ktrashrc"."\\/home\\/foglar\\/.local\\/share\\/Trash"."Percent" = 10; + "ktrashrc"."\\/home\\/foglar\\/.local\\/share\\/Trash"."UseSizeLimit" = true; + "ktrashrc"."\\/home\\/foglar\\/.local\\/share\\/Trash"."UseTimeLimit" = false; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."Desktops"."Id_1" = "66042c39-a040-4331-a4fb-d7d723534146"; + "kwinrc"."Desktops"."Id_2" = "da694f1d-0b4f-4864-a7ab-f7fca1484514"; + "kwinrc"."Desktops"."Id_3" = "8cb8e59c-4f5d-411a-b4ae-93e300c42279"; + "kwinrc"."Desktops"."Id_4" = "2f233f6c-47f2-492d-9730-0a3c7c644d41"; + "kwinrc"."Desktops"."Number" = 4; + "kwinrc"."Desktops"."Rows" = 1; + "kwinrc"."Plugins"."poloniumEnabled" = true; + "kwinrc"."Tiling"."padding" = 4; + "kwinrc"."Tiling/5eab1ee1-97e8-53bb-af55-2501eccfca18"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5},{\"width\":0.5}]}"; + "kwinrc"."Tiling/66597c11-0460-50e9-950d-d38fee6a4b15"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Xwayland"."Scale" = 1.1; + "kxkbrc"."Layout"."DisplayNames" = ","; + "kxkbrc"."Layout"."LayoutList" = "us,cz"; + "kxkbrc"."Layout"."Use" = true; + "kxkbrc"."Layout"."VariantList" = ","; + "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; + "plasmarc"."Wallpapers"."usersWallpapers" = "/nix/store/0gh072ac3vzs15giynxzcb1jcrzf43nq-stylix-kde-theme/share/wallpapers/stylix/"; + "spectaclerc"."Annotations"."annotationToolType" = 2; + "spectaclerc"."GuiConfig"."captureMode" = 0; + "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; + "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; + }; + dataFile = { + }; + }; +} diff --git a/nixos/home.nix b/nixos/home.nix index d7882ea..abd45da 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -19,7 +19,7 @@ ".config/hypr/hyprlock.conf".source = ../config/hyprlock.conf; ".config/hypr/mocha.conf".source = ../config/mocha.conf; ".config/hypr/hypridle.conf".source = ../config/hypridle.conf; - ".config/dolphinrc".source = ../config/dolphinrc; + #".config/dolphinrc".source = ../config/dolphinrc; ".prettierrc".text = '' { "tabWidth": 4, diff --git a/nixos/packages/applications.nix b/nixos/packages/applications.nix index 22b2290..cf6ddfa 100644 --- a/nixos/packages/applications.nix +++ b/nixos/packages/applications.nix @@ -18,10 +18,9 @@ stellarium libreoffice localsend - plasma5Packages.kdeconnect-kde + kdePackages.kdeconnect-kde vlc openrocket - spotify spotube inkscape gnome-disk-utility @@ -39,7 +38,7 @@ loupe simple-scan vesktop - gnome.gnome-font-viewer + gnome-font-viewer evince ]); }; diff --git a/nixos/packages/applications/spotify.nix b/nixos/packages/applications/spotify.nix index da1a189..046132d 100644 --- a/nixos/packages/applications/spotify.nix +++ b/nixos/packages/applications/spotify.nix @@ -9,6 +9,10 @@ program.spotify.enable = lib.mkEnableOption "enable spotify"; }; + imports = [ + inputs.spicetify-nix.homeManagerModules.default + ]; + config = lib.mkIf config.program.spotify.enable { programs.spicetify = let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; @@ -19,8 +23,8 @@ hidePodcasts shuffle # shuffle+ (special characters are sanitized out of extension names) ]; - theme = spicePkgs.themes.catppuccin; - colorScheme = "mocha"; + #theme = spicePkgs.themes.catppuccin; + #colorScheme = "mocha"; }; }; } diff --git a/nixos/packages/packages.nix b/nixos/packages/packages.nix index c2aca9a..a53c3f9 100644 --- a/nixos/packages/packages.nix +++ b/nixos/packages/packages.nix @@ -10,6 +10,7 @@ ./terminal_tools.nix ./applications.nix ./applications/firefox.nix + ./applications/spotify.nix ]; group.terminal_tools.enable = lib.mkDefault true; @@ -19,6 +20,7 @@ group.hacking.enable = lib.mkDefault true; program.firefox.enable = lib.mkDefault true; + program.spotify.enable = lib.mkDefault true; home.packages = with pkgs; [ alejandra diff --git a/nixos/packages/programming/neovim.nix b/nixos/packages/programming/neovim.nix index e0fff56..c0cb0ed 100644 --- a/nixos/packages/programming/neovim.nix +++ b/nixos/packages/programming/neovim.nix @@ -1,6 +1,41 @@ -{lib}: { + lib, + config, + pkgs, + ... +}: { options = { - neovim = lib.mkEnableOption "neovim"; - }; -} \ No newline at end of file + program.neovim.enable = lib.mkEnableOption "neovim"; + }; + + config = lib.mkIf config.program.neovim.enable { + home.sessionVariables.EDITOR = "nvim"; + + programs.neovim.enable = true; + + #programs.neovim = let + # toLua = str: "lua << EOF\n${str}\nEOF\n"; + # toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n"; + #in { + # enable = true; + # defaultEditor = true; + # viAlias = true; + # vimAlias = true; + # extraPackages = with pkgs; [ + # lua-language-server + # xclip + # wl-clipboard + # ]; +# + # plugins = with pkgs.vimPlugins; [ + # { + # plugin = nvim-lspconfig; + # config = toLuaFile ./nvim/plugin/lsp.lua; + # } + # #pkgs.vimPlugins.LazyVim + # #pkgs.vimPlugins.mason-lspconfig-nvim + # #pkgs.vimPlugins.nvchad + # ]; + #}; + }; +} diff --git a/nixos/packages/programming/programming.nix b/nixos/packages/programming/programming.nix index 446be6f..b45c021 100644 --- a/nixos/packages/programming/programming.nix +++ b/nixos/packages/programming/programming.nix @@ -4,7 +4,6 @@ config, ... }: { - options = { group.programming.enable = lib.mkEnableOption "enable programming toolset"; @@ -13,15 +12,15 @@ imports = [ ./code.nix ./git.nix + ./neovim.nix ]; config = lib.mkIf config.group.programming.enable { - program.vscode.enable = lib.mkDefault true; program.git.enable = lib.mkDefault true; + program.neovim.enable = lib.mkDefault true; home.packages = with pkgs; [ - neovim arduino-ide distrobox go diff --git a/nixos/packages/terminal_tools.nix b/nixos/packages/terminal_tools.nix index a29b68f..9298965 100644 --- a/nixos/packages/terminal_tools.nix +++ b/nixos/packages/terminal_tools.nix @@ -41,7 +41,7 @@ btop.enable = true; fzf.enable = true; neovim.enable = true; - spicetify.enable = true; + #spicetify.enable = true; }; home.packages = with pkgs; [ @@ -62,7 +62,6 @@ fzf tldr ranger - spicetify-cli unzip ]; }; diff --git a/nixos/packages/tools/shell.nix b/nixos/packages/tools/shell.nix index 73aff15..0f919f7 100644 --- a/nixos/packages/tools/shell.nix +++ b/nixos/packages/tools/shell.nix @@ -15,7 +15,7 @@ enableCompletion = true; shellAliases = { - vim = "nvim"; + #vim = "nvim"; ls = "exa --icons"; ll = "exa -alh --icons"; tree = "exa --tree --icons"; @@ -43,7 +43,6 @@ }; home.sessionVariables = { - EDITOR = "nvim"; FLAKE = "/home/foglar/dotfiles"; XDG_DATA_HOME = "$HOME/.local/share"; XDG_PICTURES_DIR = "$HOME/Pictures/Screenshots/"; diff --git a/nixos/system/packages.nix b/nixos/system/packages.nix index 77475d9..5e2bc18 100644 --- a/nixos/system/packages.nix +++ b/nixos/system/packages.nix @@ -14,6 +14,6 @@ virt-manager.enable = lib.mkDefault true; }; desktop.steamdeck.enable = lib.mkDefault false; - programs.kdeconnect.enable = true; - programs.wireshark.enable = true; + programs.kdeconnect.enable = lib.mkDefault true; + programs.wireshark.enable = lib.mkDefault true; }