diff --git a/home-manager/apps.nix b/home-manager/apps.nix index 0025603..fd6f2b6 100644 --- a/home-manager/apps.nix +++ b/home-manager/apps.nix @@ -6,7 +6,10 @@ pkgs, ... }: { - imports = []; + imports = [ + ./neovim.nix + ./plasma.nix + ]; nixpkgs = { overlays = [ @@ -26,6 +29,7 @@ }; home.packages = with pkgs; [ + alacritty bitwarden direnv discord-ptb @@ -34,6 +38,7 @@ dotnetCorePackages.dotnet_9.sdk file fzf + gcc ghex gimp gnome-calculator @@ -44,6 +49,7 @@ jetbrains.idea-ultimate jetbrains.pycharm-professional jetbrains.rider + jetbrains.rust-rover inkscape inotify-tools libreoffice diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix new file mode 100644 index 0000000..213f94a --- /dev/null +++ b/home-manager/neovim.nix @@ -0,0 +1,22 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = { + enable = true; + vimAlias = true; + + extraConfig = '' + set number relativenumber + + ''; + + plugins = [ + { plugin = pkgs.vimPlugins.vim-numbertoggle; } + { plugin = pkgs.vimPlugins.vim-sleuth; } + { plugin = pkgs.vimPlugins.lualine-nvim; } + { plugin = pkgs.vimPlugins.neoscroll-nvim; } + ]; + }; +} diff --git a/home-manager/plasma.nix b/home-manager/plasma.nix index 2757896..d4ae904 100644 --- a/home-manager/plasma.nix +++ b/home-manager/plasma.nix @@ -2,7 +2,7 @@ programs.plasma = { enable = true; shortcuts = { - "ActivityManager"."switch-to-activity-b2ab5fe5-5164-403b-a54c-47948116f11a" = ",none,Switch to activity \"Stay Awake\""; + "ActivityManager"."switch-to-activity-b2ab5fe5-5164-403b-a54c-47948116f11a" = [ ]; "ActivityManager"."switch-to-activity-df5108d4-687b-4cd3-835e-318d72116b93" = [ ]; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K"; @@ -18,7 +18,7 @@ "kmix"."increase_volume_small" = "Shift+Volume Up"; "kmix"."mic_mute" = ["Microphone Mute\\, Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = [ ]; + "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; @@ -27,6 +27,8 @@ "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; "ksmserver"."Shut Down" = "none,,Shut Down"; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."ClearLastMouseMark" = "Meta+Shift+F12"; + "kwin"."ClearMouseMarks" = "Meta+Shift+F11"; "kwin"."Cube" = "Meta+Ctrl+G,none,Toggle Cube"; "kwin"."Cycle Overview" = [ ]; "kwin"."Cycle Overview Opposite" = [ ]; @@ -103,12 +105,12 @@ "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" = [ ]; - "kwin"."Walk Through Windows Alternative (Reverse)" = [ ]; + "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" = [ ]; - "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = [ ]; + "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" = "Alt+F4"; @@ -116,7 +118,7 @@ "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" = ["Meta+PgUp" "Meta+Up,Meta+PgUp,Maximize Window"]; "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally"; "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically"; "kwin"."Window Minimize" = "Meta+PgDown"; @@ -130,8 +132,8 @@ "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; "kwin"."Window One Screen Down" = "Meta+Shift+Down,,Move Window One Screen Down"; "kwin"."Window One Screen Up" = "Meta+Shift+Up,,Move 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" = "none,,Move Window Down"; "kwin"."Window Pack Left" = "none,,Move Window Left"; @@ -233,8 +235,9 @@ "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/lookandfeeltool.desktop"."_launch" = "Ctrl+Sleep"; - "services/org.kde.konsole.desktop"."_launch" = [ ]; + "services/alacritty.desktop"."_launch" = "Alt+Q"; + "services/lookandfeeltool-4.desktop"."_launch" = "Ctrl+Shift+P"; + "services/lookandfeeltool.desktop"."_launch" = "Ctrl+Alt+Shift+P"; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = ["Ctrl+Shift+Esc" "Meta+Esc"]; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = [ ]; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = [ ]; @@ -293,6 +296,7 @@ "kdeglobals"."KFileDialog Settings"."Sort reversed" = true; "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 140; "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree"; + "kdeglobals"."Shortcuts"."Help" = ""; "kdeglobals"."WM"."activeBackground" = "227,229,231"; "kdeglobals"."WM"."activeBlend" = "227,229,231"; "kdeglobals"."WM"."activeForeground" = "35,38,41"; @@ -334,17 +338,21 @@ "kwinrc"."Effect-overview"."GridBorderActivate" = 7; "kwinrc"."Effect-shakecursor"."Magnification" = 10; "kwinrc"."Effect-slide"."HorizontalGap" = 0; - "kwinrc"."Effect-slide"."SlideBackground" = false; "kwinrc"."Effect-slide"."VerticalGap" = 0; "kwinrc"."Effect-wobblywindows"."AdvancedMode" = true; - "kwinrc"."Effect-wobblywindows"."Drag" = 50; + "kwinrc"."Effect-wobblywindows"."Drag" = 100; + "kwinrc"."Effect-wobblywindows"."MoveFactor" = 25; + "kwinrc"."Effect-wobblywindows"."Stiffness" = 50; + "kwinrc"."Effect-wobblywindows"."WobblynessLevel" = 4; "kwinrc"."MouseBindings"."CommandInactiveTitlebar3" = "Nothing"; "kwinrc"."MouseBindings"."CommandTitlebarWheel" = "Change Opacity"; "kwinrc"."Plugins"."blurEnabled" = true; "kwinrc"."Plugins"."cubeEnabled" = true; "kwinrc"."Plugins"."desktopchangeosdEnabled" = true; + "kwinrc"."Plugins"."fadedesktopEnabled" = true; "kwinrc"."Plugins"."minimizeallEnabled" = true; "kwinrc"."Plugins"."shakecursorEnabled" = true; + "kwinrc"."Plugins"."slideEnabled" = false; "kwinrc"."Plugins"."translucencyEnabled" = true; "kwinrc"."Script-desktopchangeosd"."PopupHideDelay" = 600; "kwinrc"."SubSession: 037b4336-809c-4a07-a148-9ef660a5cc9c"."active" = "-1"; diff --git a/machines/common/configuration.nix b/machines/common/configuration.nix index 6145ee1..3798326 100644 --- a/machines/common/configuration.nix +++ b/machines/common/configuration.nix @@ -37,6 +37,7 @@ }) config.nix.registry; + nix.settings.trusted-users = [ "root" "horseman" ]; nix.settings = { experimental-features = "nix-command flakes"; auto-optimise-store = true; diff --git a/machines/luna/configuration.nix b/machines/luna/configuration.nix index 9e1adb8..29970c8 100644 --- a/machines/luna/configuration.nix +++ b/machines/luna/configuration.nix @@ -22,6 +22,9 @@ networking.hostName = "luna"; networking.networkmanager.enable = true; + networking.extraHosts = '' + 127.0.0.1 koala.rails.local members.rails.local leden.rails.local intro.rails.local + ''; services.xserver.enable = true; services.desktopManager.plasma6.enable = true; @@ -38,5 +41,7 @@ loopback.enable = false; }; + virtualisation.docker.enable = true; + users.extraUsers.horseman.extraGroups = [ "jackaudio" ]; }