home: refactor to support slightly different pc/laptop configs
This commit is contained in:
parent
fd4ce0cdc4
commit
d9dafd4dc0
@ -26,12 +26,12 @@
|
|||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
|
outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators, secrix }:
|
||||||
let
|
let
|
||||||
hmModule = {
|
hmModule = file: {
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||||
|
|
||||||
home-manager.users.cazzzer = import ./home;
|
home-manager.users.cazzzer = import file;
|
||||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||||
# arguments to home.nix
|
# arguments to home.nix
|
||||||
};
|
};
|
||||||
@ -50,7 +50,7 @@
|
|||||||
./users/cazzzer
|
./users/cazzzer
|
||||||
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
hmModule
|
(hmModule ./home/cazzzer-pc.nix)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
Yura-TPX13 = nixpkgs.lib.nixosSystem {
|
Yura-TPX13 = nixpkgs.lib.nixosSystem {
|
||||||
@ -63,7 +63,7 @@
|
|||||||
./users/cazzzer
|
./users/cazzzer
|
||||||
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
# https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
hmModule
|
(hmModule ./home/cazzzer-laptop.nix)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
VM = nixpkgs.lib.nixosSystem {
|
VM = nixpkgs.lib.nixosSystem {
|
||||||
|
21
home/cazzzer-laptop.nix
Normal file
21
home/cazzzer-laptop.nix
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./modules
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.plasma = {
|
||||||
|
kwin.virtualDesktops.number = 6;
|
||||||
|
kwin.virtualDesktops.rows = 2;
|
||||||
|
|
||||||
|
shortcuts.kwin = {
|
||||||
|
"Switch to Desktop 1" = "Meta+F1";
|
||||||
|
"Switch to Desktop 2" = "Meta+F2";
|
||||||
|
"Switch to Desktop 3" = "Meta+F3";
|
||||||
|
"Switch to Desktop 4" = "Meta+Z";
|
||||||
|
"Switch to Desktop 5" = "Meta+X";
|
||||||
|
"Switch to Desktop 6" = "Meta+C";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
9
home/cazzzer-pc.nix
Normal file
9
home/cazzzer-pc.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./modules
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.plasma.kwin.virtualDesktops.number = 2;
|
||||||
|
}
|
@ -4,6 +4,10 @@
|
|||||||
programs.plasma = {
|
programs.plasma = {
|
||||||
enable = true;
|
enable = true;
|
||||||
overrideConfig = true;
|
overrideConfig = true;
|
||||||
|
resetFilesExclude = [
|
||||||
|
"plasma-org.kde.plasma.desktop-appletsrc"
|
||||||
|
];
|
||||||
|
# Use tela circle icon theme if installed in system packages
|
||||||
workspace.iconTheme = if builtins.elem pkgs.tela-circle-icon-theme osConfig.environment.systemPackages then "Tela-circle" else null;
|
workspace.iconTheme = if builtins.elem pkgs.tela-circle-icon-theme osConfig.environment.systemPackages then "Tela-circle" else null;
|
||||||
fonts = let
|
fonts = let
|
||||||
defaultFont = {
|
defaultFont = {
|
||||||
@ -23,7 +27,6 @@
|
|||||||
{ layout = "minimak-4"; displayName = "us4"; }
|
{ layout = "minimak-4"; displayName = "us4"; }
|
||||||
{ layout = "ru"; displayName = "ru"; }
|
{ layout = "ru"; displayName = "ru"; }
|
||||||
];
|
];
|
||||||
kwin.virtualDesktops.number = 2;
|
|
||||||
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
|
session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
|
||||||
shortcuts = {
|
shortcuts = {
|
||||||
# kmix.mic_mute = "ScrollLock";
|
# kmix.mic_mute = "ScrollLock";
|
@ -14,29 +14,5 @@
|
|||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG yuri@tati.sh"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG yuri@tati.sh"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHczlipzGWv8c6oYwt2/9ykes5ElfneywDXBTOYbfSfn Pixel7Pro"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHczlipzGWv8c6oYwt2/9ykes5ElfneywDXBTOYbfSfn Pixel7Pro"
|
||||||
];
|
];
|
||||||
# TODO: think of a better way to do this
|
|
||||||
packages = with pkgs; lib.optionals (config.networking.hostName == "Yura-PC") [
|
|
||||||
# Python
|
|
||||||
python3
|
|
||||||
poetry
|
|
||||||
|
|
||||||
# Haskell
|
|
||||||
haskellPackages.ghc
|
|
||||||
haskellPackages.stack
|
|
||||||
|
|
||||||
# Node
|
|
||||||
nodejs_22
|
|
||||||
pnpm
|
|
||||||
bun
|
|
||||||
|
|
||||||
# Nix
|
|
||||||
nil
|
|
||||||
nixd
|
|
||||||
nixfmt-rfc-style
|
|
||||||
|
|
||||||
# Gleam
|
|
||||||
gleam
|
|
||||||
beamMinimal26Packages.erlang
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user