materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:f4107f214a3ada69afd20ea7adc2c7467bba5a39
Branches Tags
materus:master
materus:experimental
materus:inputs
..
compare: materus:2cfdcf34bb0099bd27c30803d289545004ce9b5a
Branches Tags
materus:experimental
materus:master
materus:inputs

No commits in common. "f4107f214a3ada69afd20ea7adc2c7467bba5a39" and "2cfdcf34bb0099bd27c30803d289545004ce9b5a" have entirely different histories.
f4107f214a ... 2cfdcf34bb

15 changed files with 59 additions and 85 deletions
Show Stats Expand all files Collapse all files

1
configurations/host/flamaster/configuration.nix
View File

@ -119,7 +119,6 @@
packages = with pkgs; [
kate
];
shell = pkgs.zsh;
};
# Allow unfree packages

2
configurations/host/flamaster/home/materus/default.nix
View File

@ -11,8 +11,6 @@
enableTerminalExtra = lib.mkDefault true;
enableNixDevel = lib.mkDefault true;
zsh.enable = true;
};
home.packages = [

2
configurations/host/materusPC/home/materus/default.nix
View File

@ -77,7 +77,7 @@
dub
]);
editor.emacs.enable = true;
editor.emacs.enable = false;
};

3
configurations/host/valkyrie/default.nix
View File

@ -73,7 +73,6 @@
packages = [
];
openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/materus.pub") ];
shell = pkgs.zsh;
};
users.users.acme.openssh.authorizedKeys.keyFiles = [ ("${materusArg.cfg.path}" + "/extraFiles/keys/ssh/waffentrager.pub") ];
users.users.acme.shell = pkgs.scponly;
@ -100,7 +99,7 @@
services.openssh.enable = true;
services.openssh.openFirewall = false;
services.openssh.settings.PermitRootLogin = "no";
services.openssh.settings.PasswordAuthentication = false;
services.openssh.settings.PasswordAuthentication = true;

1
configurations/host/valkyrie/home/materus/default.nix
View File

@ -12,6 +12,5 @@
fish.enable = false;
bash.enable = true;
zsh.enable = true;
};
}

2
configurations/host/valkyrie/services/dcbot.nix
View File

@ -12,7 +12,7 @@
lib.mkIf cfg.enable {
sops.templates."dcbot.env".content = ''
TOKEN=${config.sops.placeholder.discord-token}
MAX_PLAYLIST_SIZE=100
MAX_PLAYLIST_SIZE=10
PRUNING=false
LOCALE=pl
DEFAULT_VOLUME=100

1
configurations/host/waffentrager/configuration.nix
View File

@ -42,7 +42,6 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl"
];
hashedPasswordFile = config.sops.secrets."users/materus".path;
shell = pkgs.zsh;
};
nix = {

1
configurations/host/waffentrager/home/materus/default.nix
View File

@ -12,6 +12,5 @@
fish.enable = false;
bash.enable = true;
zsh.enable = true;
};
}

2
configurations/host/waffentrager/services/auth.nix
View File

@ -4,7 +4,7 @@
config =
let
cfg = config.waffentragerService.auth;
cfg = config.auth.postgresql;
in
lib.mkIf cfg.enable {
waffentragerService.elements.enable = true;

3
configurations/profile/home/default.nix
View File

@ -52,7 +52,8 @@ in
enableZshIntegration = lib.mkDefault config.programs.zsh.enable;
};
programs.tmux.enable = lib.mkDefault cfg.enableTerminal;
programs.tmux.clock24 = lib.mkDefault config.programs.tmux.enable;
programs.fzf = {
enable = lib.mkDefault cfg.enableTerminalExtra;

2
configurations/profile/home/editor/emacs/default.nix
View File

@ -113,7 +113,7 @@ in
programs.emacs = {
enable = true;
package = with pkgs; lib.mkDefault materusArg.pkgs.emacs-materus;
package = with pkgs; lib.mkDefault (emacs29.override { withX = true; withGTK3 = true; withAlsaLib = true; withGconf = true; withImageMagick = true; withXwidgets = true; });
extraPackages = epkgs: ((packages epkgs));
extraConfig = default-config;
};

1
configurations/profile/home/terminal/default.nix
View File

@ -3,7 +3,6 @@
imports = [
./wezterm.nix
./tmux.nix
];
}

20
configurations/profile/home/terminal/tmux.nix
View File

@ -1,20 +0,0 @@
{ materusArg, config, lib, ... }:
let
cfg = config.materus.profile.tmux;
in
{
options.materus.profile.tmux.enable = materusArg.pkgs.lib.mkBoolOpt true "Enable materus tmux config";
config = lib.mkIf cfg.enable
{
programs.tmux = {
enable = true;
clock24 = lib.mkDefault true;
aggressiveResize = lib.mkDefault true;
escapeTime = lib.mkDefault 0;
historyLimit = lib.mkDefault 10000;
mouse = lib.mkDefault true;
terminal = lib.mkDefault "tmux-256color";
};
};
}

3
extraFiles/config/emacs/init.el
View File

@ -39,7 +39,8 @@
;Graphical
(when (display-graphic-p)
(set-frame-font "Hack Nerd Font" nil t)
(set-frame-font "FiraCode Nerd Font" nil t)
)

100
flake.lock
View File

@ -167,11 +167,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1712336909,
"narHash": "sha256-tpmLGa9l2cwsf/1g4tPFOQDOeDrEgAsKHFhKabd0nyo=",
"lastModified": 1712108714,
"narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "b82c77652e4191f41842c6ae39853490f0cc1e13",
"rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
"type": "github"
},
"original": {
@ -194,11 +194,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1712336909,
"narHash": "sha256-tpmLGa9l2cwsf/1g4tPFOQDOeDrEgAsKHFhKabd0nyo=",
"lastModified": 1712108714,
"narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "b82c77652e4191f41842c6ae39853490f0cc1e13",
"rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720",
"type": "github"
},
"original": {
@ -359,11 +359,11 @@
]
},
"locked": {
"lastModified": 1712317700,
"narHash": "sha256-rnkQ6qMhlxfjpCECkTMlFXHU/88QvC5KpdJWq5H6F1E=",
"lastModified": 1712093955,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "782eed8bb64b27acaeb7c17be4a095c85e65717f",
"rev": "80546b220e95a575c66c213af1b09fe255299438",
"type": "github"
},
"original": {
@ -378,10 +378,10 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1712093955,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
"path": "/nix/store/41m3hm6nlgz88vv3zxpjmmrk0r08v9ba-source",
"rev": "80546b220e95a575c66c213af1b09fe255299438",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"path": "/nix/store/vk0zfmxpm3m8lzf0wf3jm7v6mizx7fh8-source",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "path"
},
"original": {
@ -402,11 +402,11 @@
"nur": "nur"
},
"locked": {
"lastModified": 1712344538,
"narHash": "sha256-Cg9tOeingv0tPUnENdlxfsoWLuZfYUjFgFjrG5+P1js=",
"lastModified": 1711186149,
"narHash": "sha256-6aiHJLaPdyMh3nLrYnyfGJbz3G0I9fWuAIBISKuHsg0=",
"owner": "materusPL",
"repo": "Nixerus",
"rev": "14e31ce7591aae41102c8e417f3f0fb02700c126",
"rev": "8b8d4861b56f6e3c49cbd9253b255b92b19c3f68",
"type": "github"
},
"original": {
@ -429,11 +429,11 @@
"nur": "nur_3"
},
"locked": {
"lastModified": 1712344538,
"narHash": "sha256-Cg9tOeingv0tPUnENdlxfsoWLuZfYUjFgFjrG5+P1js=",
"lastModified": 1711186149,
"narHash": "sha256-6aiHJLaPdyMh3nLrYnyfGJbz3G0I9fWuAIBISKuHsg0=",
"owner": "materusPL",
"repo": "Nixerus",
"rev": "14e31ce7591aae41102c8e417f3f0fb02700c126",
"rev": "8b8d4861b56f6e3c49cbd9253b255b92b19c3f68",
"type": "github"
},
"original": {
@ -445,11 +445,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712324865,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github"
},
"original": {
@ -461,11 +461,11 @@
},
"nixos-hardware_2": {
"locked": {
"lastModified": 1712324865,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github"
},
"original": {
@ -477,11 +477,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"lastModified": 1710806803,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"type": "github"
},
"original": {
@ -493,11 +493,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1712168706,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {
@ -525,11 +525,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1712168706,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {
@ -557,11 +557,11 @@
},
"nixpkgs-stable_5": {
"locked": {
"lastModified": 1712168706,
"narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
"lastModified": 1711668574,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
"type": "github"
},
"original": {
@ -573,11 +573,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
},
"original": {
@ -602,11 +602,11 @@
},
"nur_2": {
"locked": {
"lastModified": 1712342638,
"narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=",
"lastModified": 1712133822,
"narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57",
"rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
"type": "github"
},
"original": {
@ -631,11 +631,11 @@
},
"nur_4": {
"locked": {
"lastModified": 1712342638,
"narHash": "sha256-0yvbIJSRMh09d3BEySpbC+ZNHV7o+nlLH9emLxB6Uq4=",
"lastModified": 1712133822,
"narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "08506b97dda7b6e5b483885d7bb0f5e6bfdc9b57",
"rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
"type": "github"
},
"original": {
@ -647,10 +647,10 @@
},
"nur_5": {
"locked": {
"lastModified": 1712133822,
"narHash": "sha256-MMoHOnX4GSzFTsUb/0FGEHWcduz4K/Vx7yHB+6vGarI=",
"path": "/nix/store/dprq3vl3bv6jxkhbby0d4nplqgi2gfjy-source",
"rev": "319e516a81bb0bd5187487710394b3f5c4f96600",
"lastModified": 1711532663,
"narHash": "sha256-Y0I1/ENnkXvrgK3xLKaRkPZSfbgQkcWu2ctqbwU4Fb0=",
"path": "/nix/store/rnz6ahf0g4kd052iiz1f3y0jrg3iv1w0-source",
"rev": "f7a87cffaf22af88cfeda2951de842aa919e2fdd",
"type": "path"
},
"original": {