diff --git a/flake.lock b/flake.lock index 26677ec..de4eb9d 100755 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,14 @@ }, "nixHW": { "locked": { + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "lastModified": 1715148395, "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "nixos", "repo": "nixos-hardware", "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -556,6 +559,29 @@ "type": "github" } }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714856962, + "narHash": "sha256-2te5GG8TVNBF44uMF4G0XFGW+Jt02i/ZkspSNFzjgT0=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "1554e19ede17de46106dd95820eeea05086a5720", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "anyrun": "anyrun", @@ -572,6 +598,7 @@ "unstable" ], "nur": "nur", + "plasma-manager": "plasma-manager", "stable": "stable", "unstable": "unstable", "vscode-ext": "vscode-ext" diff --git a/flake.nix b/flake.nix index b634182..59a01e7 100755 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,11 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + plasma-manager = { + url = "github:pjones/plasma-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home"; + }; nixHW.url = "github:nixos/nixos-hardware/master"; f2k = { url = "github:moni-dz/nixpkgs-f2k"; diff --git a/hosts/ocean-t460/configuration.nix b/hosts/ocean-t460/configuration.nix index e72c4a1..a52f945 100755 --- a/hosts/ocean-t460/configuration.nix +++ b/hosts/ocean-t460/configuration.nix @@ -24,15 +24,15 @@ }; }; networking.firewall.allowedTCPPorts = [ 25565 ]; - nix.buildMachines = [{ - hostName = "192.168.1.137"; - system = "x86_64-linux"; - }]; - nix.distributedBuilds = true; + #nix.buildMachines = [{ + # hostName = "192.168.1.137"; + # system = "x86_64-linux"; + #}]; + #nix.distributedBuilds = true; - nix.extraOptions = '' - builders-use-substitutes = true - ''; + #nix.extraOptions = '' + # builders-use-substitutes = true + #''; #services.desktopManager.cosmic.enable = true; } diff --git a/hosts/shared/configuration.nix b/hosts/shared/configuration.nix index dac8ead..f7c6817 100755 --- a/hosts/shared/configuration.nix +++ b/hosts/shared/configuration.nix @@ -38,12 +38,15 @@ environment = { systemPackages = with pkgs; [ + aha # Required for "Firmware Security" page of KDE's Info Center + clinfo # Required for "OpenCL" page of KDE's Info Center cmake coreutils curl fd gcc git + glxinfo # Required for "OpenGL (GLX)" page of KDE's Info Center libnotify lm_sensors man-pages @@ -51,6 +54,9 @@ ripgrep unrar unzip + virtualglLib # Required for "OpenGL (EGL)" page of KDE's Info Center + vulkan-tools # Required for "Vulkan" page of KDE's Info Center + wayland-utils # Required for "Wayland" page of KDE's Info Center wget xclip zip @@ -84,6 +90,8 @@ services = { dbus.enable = true; + fwupd.enable = true; # Required for "Firmware Security" page of KDE's Info Center + openssh.enable = true; xl2tpd.enable = true; strongswan = { @@ -102,6 +110,8 @@ # whether shared printers are advertised browsing = true; }; + + desktopManager.plasma6.enable = true; }; hardware.logitech.wireless = { diff --git a/modules/desktop/gaming/steam.nix b/modules/desktop/gaming/steam.nix index ef9b781..794694c 100755 --- a/modules/desktop/gaming/steam.nix +++ b/modules/desktop/gaming/steam.nix @@ -25,7 +25,7 @@ in { sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; systemPackages = with pkgs; [ - protonup + protonup-qt ]; }; }; diff --git a/modules/users.nix b/modules/users.nix index 05e3eca..1ad5d01 100755 --- a/modules/users.nix +++ b/modules/users.nix @@ -99,10 +99,7 @@ in }; octelly = { desc = "Eli Štefků"; - modules = [ - inputs.hyprland.homeManagerModules.default - inputs.anyrun.homeManagerModules.default - ]; + modules = [ ]; fc = { # `fonts` takes a list of packages fonts = with pkgs; [ @@ -129,6 +126,11 @@ in useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { inherit inputs system; }; + sharedModules = [ + inputs.anyrun.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; users = homeCfg; }; diff --git a/users/octelly/default.nix b/users/octelly/default.nix index 89fa704..8fdf603 100755 --- a/users/octelly/default.nix +++ b/users/octelly/default.nix @@ -58,7 +58,7 @@ let #}); firefoxMainProfileName = "main"; in -{ +rec { home = { packages = with pkgs; [ #warble @@ -134,6 +134,9 @@ in # ]; #}) + jellyfin-media-player + moonlight-qt + networkmanagerapplet networkmanager-l2tp @@ -153,6 +156,8 @@ in mangohud #tmuf + krdc + # flameshot and dependencies flameshot grim @@ -379,10 +384,22 @@ in #services.gvfs.enable = true; #services.tumbler.enable = true; - services.swayosd = { - enable = true; + #services.swayosd = { + # enable = true; + #}; + + programs.plasma = { + #enable = true; + workspace = { + iconTheme = gtk.iconTheme.name; + cursorTheme = gtk.cursorTheme.name; + + clickItemTo = "select"; + }; }; + services.kdeconnect.enable = true; + programs.vscode = { enable = true; extensions = (with pkgs.open-vsx; [ @@ -421,16 +438,20 @@ in ]); userSettings = { # Vim controls - "extensions.experimental.affinity" = { - "asvetliakov.vscode-neovim" = 1; - }; + #"extensions.experimental.affinity" = { + # "asvetliakov.vscode-neovim" = 1; + #}; # theming + "workbench.preferredDarkColorTheme" = "Sonokai Shusia"; "workbench.colorTheme" = "Sonokai Shusia"; "workbench.iconTheme" = "material-icon-theme"; "material-icon-theme.folder.color" = "#e5c463"; "window.menuBarVisibility" = "toggle"; + "window.autoDetectColorScheme" = true; + "window.titleBarStyle" = "custom"; + "window.customTitleBarVisibility" = "auto"; "editor.fontFamily" = "'Maple Mono NF', 'Cartograph CF', 'FiraCode Nerd Font Mono', 'monospace', monospace"; "debug.console.fontFamily" = "'Maple Mono NF', 'Cartograph CF', 'FiraCode Nerd Font Mono', 'monospace', monospace"; @@ -652,22 +673,24 @@ in gtk-application-prefer-dark-theme = darkMode; }; - gtk.iconTheme.name = if darkMode then "Colloid-pink-default-dark" else "Colloid-pink-default-light"; - gtk.iconTheme.package = - (pkgs.colloid-icon-theme.override { - schemeVariants = [ "default" ]; - colorVariants = [ "pink" ]; - }); + #gtk.iconTheme.name = if darkMode then "Colloid-pink-default-dark" else "Colloid-pink-default-light"; + #gtk.iconTheme.package = + # (pkgs.colloid-icon-theme.override { + # schemeVariants = [ "default" ]; + # colorVariants = [ "pink" ]; + # }); + gtk.iconTheme.name = if darkMode then "kora" else "kora-light-panel"; + gtk.iconTheme.package = pkgs.kora-icon-theme; gtk.cursorTheme.name = "Posy_Cursor_Black"; gtk.cursorTheme.package = posysCursors; - #qt.enable = true; - ##qt.platformTheme = "gnome"; - #qt.platformTheme = "qtct"; - #qt.style.name = "kvantum"; - ##qt.style.package = pkgs.adwaita-qt; - ##qt.style.name = if darkMode then "adwaita-dark" else "adwaita"; + qt.enable = true; + #qt.platformTheme = "gnome"; + qt.platformTheme.name = "qtct"; + qt.style.name = "kvantum"; + #qt.style.package = pkgs.adwaita-qt; + #qt.style.name = if darkMode then "adwaita-dark" else "adwaita"; xresources.properties = { # 96 is 1x