Compare commits

...

7 Commits

5 changed files with 152 additions and 97 deletions

View File

@ -3,6 +3,7 @@
imports = [
./apps.nix
./java.nix
./users.nix
./desktop
];

View File

@ -0,0 +1,27 @@
{ pkgs, materusArg, config, ... }:
{
users.users.materus = {
isNormalUser = true;
extraGroups = [
"audio"
"video"
"render"
"pipewire"
"wheel"
"networkmanager"
"input"
"kvm"
"libvirt-qemu"
"libvirt"
"libvirtd"
"podman"
"scanner"
"lp"
];
shell = pkgs.zsh;
description = "Mateusz Słodkowicz";
openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/materus.pub") ];
hashedPasswordFile = config.sops.secrets."users/materus".path;
};
}

View File

@ -53,33 +53,6 @@
users.users.materus = {
isNormalUser = true;
extraGroups = [
"audio"
"video"
"render"
"pipewire"
"wheel"
"networkmanager"
"input"
"kvm"
"libvirt-qemu"
"libvirt"
"libvirtd"
"podman"
"scanner"
"lp"
];
shell = pkgs.zsh;
description = "Mateusz Słodkowicz";
openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/materus.pub") ];
};
environment.sessionVariables = {
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";

View File

@ -6,7 +6,7 @@ let
'';
in
{
options.materus.profile.wezterm.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableDesktop "Enable materus wezterm config";
options.materus.profile.wezterm.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable materus wezterm config";
options.materus.profile.wezterm.enableHackFont = materusArg.pkgs.lib.mkBoolOpt true "Enable hack nerd font for wezterm";
options.materus.profile.wezterm.enableWezcraft = materusArg.pkgs.lib.mkBoolOpt true "Enable alias to start wezcraft with monocraft font";
options.materus.profile.wezterm.extraConfig = lib.mkOption {

View File

@ -52,14 +52,15 @@
"nixpkgs"
],
"nur": "nur_2",
"plasma-manager": "plasma-manager",
"sops-nix": "sops-nix"
},
"locked": {
"lastModified": 1709405283,
"narHash": "sha256-x5B2/Yp+80kJh/thzqIb61jFQk3zg92N0VO+unEN2po=",
"lastModified": 1729545104,
"narHash": "sha256-CcnUnJr1/O0LrtcLtvOH3nKuGr3WhITB4xXUlBDBmCE=",
"owner": "materusPL",
"repo": "nixos-config",
"rev": "ac5447eff2d074e1937908738e56741d4cb6a426",
"rev": "40869ddd024e8e996da5963f29591dfe1594944a",
"type": "github"
},
"original": {
@ -85,14 +86,15 @@
"nixpkgs-stable"
],
"nur": "nur_4",
"plasma-manager": "plasma-manager_2",
"sops-nix": "sops-nix_2"
},
"locked": {
"lastModified": 1709405283,
"narHash": "sha256-x5B2/Yp+80kJh/thzqIb61jFQk3zg92N0VO+unEN2po=",
"lastModified": 1729545104,
"narHash": "sha256-CcnUnJr1/O0LrtcLtvOH3nKuGr3WhITB4xXUlBDBmCE=",
"owner": "materusPL",
"repo": "nixos-config",
"rev": "ac5447eff2d074e1937908738e56741d4cb6a426",
"rev": "40869ddd024e8e996da5963f29591dfe1594944a",
"type": "github"
},
"original": {
@ -159,11 +161,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1729013905,
"narHash": "sha256-0D95N5nsfvQAg4RjMgTgTdubMZMUQgodSqgc3KiLRo4=",
"lastModified": 1729530678,
"narHash": "sha256-Jwhm4pV8YtrKO7rU6cEgbqsaU/6dP2qLjO33pl/Wodk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "e4a692efda41fb5afdfd961bf36cd9c73cbd5307",
"rev": "6025acb8c873345197aae8cf9ff06cf11c61d5f8",
"type": "github"
},
"original": {
@ -186,11 +188,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1729013905,
"narHash": "sha256-0D95N5nsfvQAg4RjMgTgTdubMZMUQgodSqgc3KiLRo4=",
"lastModified": 1729530678,
"narHash": "sha256-Jwhm4pV8YtrKO7rU6cEgbqsaU/6dP2qLjO33pl/Wodk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "e4a692efda41fb5afdfd961bf36cd9c73cbd5307",
"rev": "6025acb8c873345197aae8cf9ff06cf11c61d5f8",
"type": "github"
},
"original": {
@ -351,11 +353,11 @@
]
},
"locked": {
"lastModified": 1728903686,
"narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
"lastModified": 1729459288,
"narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
"rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
"type": "github"
},
"original": {
@ -394,11 +396,11 @@
"nur": "nur"
},
"locked": {
"lastModified": 1726256858,
"narHash": "sha256-5lu9sJpfgezJ0VmQFJonS3/AHBJs2afePK0cWj9CvC4=",
"lastModified": 1729545139,
"narHash": "sha256-dyYxuBNdUOH5nvpbDAgwGJI4aN9CXv+m57VMuDYDGEg=",
"owner": "materusPL",
"repo": "Nixerus",
"rev": "d5427e76c31bee2c56a05fb5d597d48d3d900418",
"rev": "c381bde8eab3998246dd7c31eb0047526a319224",
"type": "github"
},
"original": {
@ -421,11 +423,11 @@
"nur": "nur_3"
},
"locked": {
"lastModified": 1726256858,
"narHash": "sha256-5lu9sJpfgezJ0VmQFJonS3/AHBJs2afePK0cWj9CvC4=",
"lastModified": 1729545139,
"narHash": "sha256-dyYxuBNdUOH5nvpbDAgwGJI4aN9CXv+m57VMuDYDGEg=",
"owner": "materusPL",
"repo": "Nixerus",
"rev": "d5427e76c31bee2c56a05fb5d597d48d3d900418",
"rev": "c381bde8eab3998246dd7c31eb0047526a319224",
"type": "github"
},
"original": {
@ -437,11 +439,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1728729581,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
"lastModified": 1729509737,
"narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
"rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
"type": "github"
},
"original": {
@ -453,11 +455,11 @@
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1728729581,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
"lastModified": 1729509737,
"narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
"rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
"type": "github"
},
"original": {
@ -485,11 +487,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"lastModified": 1729307008,
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github"
},
"original": {
@ -501,11 +503,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1728156290,
"narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
"lastModified": 1729357638,
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "17ae88b569bb15590549ff478bab6494dde4a907",
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
"type": "github"
},
"original": {
@ -517,11 +519,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"lastModified": 1729307008,
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github"
},
"original": {
@ -533,11 +535,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1728156290,
"narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
"lastModified": 1729357638,
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "17ae88b569bb15590549ff478bab6494dde4a907",
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
"type": "github"
},
"original": {
@ -549,11 +551,11 @@
},
"nixpkgs-stable_5": {
"locked": {
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"lastModified": 1729307008,
"narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github"
},
"original": {
@ -565,11 +567,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"lastModified": 1729256560,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github"
},
"original": {
@ -581,10 +583,10 @@
},
"nur": {
"locked": {
"lastModified": 1726130808,
"narHash": "sha256-RVunrPgmrED3m43ZwLdZuM0+zKtJIMyxr6j7yPwpwHg=",
"path": "/nix/store/ymkmj47x7cb2kb286zy98xzmqm5nrl0v-source",
"rev": "d286b1c8121d3f150815181a4b6b72f5353ab2db",
"lastModified": 1729516261,
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
"path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source",
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
"type": "path"
},
"original": {
@ -594,11 +596,11 @@
},
"nur_2": {
"locked": {
"lastModified": 1729012595,
"narHash": "sha256-zsWeT+EEt6AMgAg5gF0SFCzD8Qx7Q06PbqwMGdyBS/A=",
"lastModified": 1729545054,
"narHash": "sha256-Duxerj7QvZuOBD+MQSsGS5HX08P1YoaXgMsXaS9OP8A=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b876f2af8086f0d1d062d735e15d660f3a9a9bf9",
"rev": "52e70a5189a360d779f71624e2adaf3b0cd85716",
"type": "github"
},
"original": {
@ -610,10 +612,10 @@
},
"nur_3": {
"locked": {
"lastModified": 1726130808,
"narHash": "sha256-RVunrPgmrED3m43ZwLdZuM0+zKtJIMyxr6j7yPwpwHg=",
"path": "/nix/store/ymkmj47x7cb2kb286zy98xzmqm5nrl0v-source",
"rev": "d286b1c8121d3f150815181a4b6b72f5353ab2db",
"lastModified": 1729516261,
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
"path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source",
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
"type": "path"
},
"original": {
@ -623,11 +625,11 @@
},
"nur_4": {
"locked": {
"lastModified": 1729012595,
"narHash": "sha256-zsWeT+EEt6AMgAg5gF0SFCzD8Qx7Q06PbqwMGdyBS/A=",
"lastModified": 1729545054,
"narHash": "sha256-Duxerj7QvZuOBD+MQSsGS5HX08P1YoaXgMsXaS9OP8A=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b876f2af8086f0d1d062d735e15d660f3a9a9bf9",
"rev": "52e70a5189a360d779f71624e2adaf3b0cd85716",
"type": "github"
},
"original": {
@ -639,10 +641,10 @@
},
"nur_5": {
"locked": {
"lastModified": 1728027550,
"narHash": "sha256-be13RazohHlmNJPH/zK9SGns8O0iLfwYzk77sZDB30o=",
"path": "/nix/store/59vzlkg6yp2xyk570rycvbv7hx3yjbv8-source",
"rev": "c9c5e4e57b475f94fa0ba622611428b8fa3bd1cc",
"lastModified": 1729516261,
"narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
"path": "/nix/store/yygrm3h9q9wslsdamcpahpzqzaag8rix-source",
"rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
"type": "path"
},
"original": {
@ -650,6 +652,58 @@
"type": "indirect"
}
},
"plasma-manager": {
"inputs": {
"home-manager": [
"configInputs",
"home-manager"
],
"nixpkgs": [
"configInputs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729372184,
"narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "trunk",
"repo": "plasma-manager",
"type": "github"
}
},
"plasma-manager_2": {
"inputs": {
"home-manager": [
"configInputs-stable",
"home-manager"
],
"nixpkgs": [
"configInputs-stable",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729372184,
"narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "trunk",
"repo": "plasma-manager",
"type": "github"
}
},
"private": {
"locked": {
"lastModified": 1684365822,
@ -687,11 +741,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1728345710,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
"lastModified": 1729394972,
"narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
"rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
"type": "github"
},
"original": {
@ -710,11 +764,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1728345710,
"narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=",
"lastModified": 1729394972,
"narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b",
"rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
"type": "github"
},
"original": {