Compare commits

...

3 commits

Author SHA1 Message Date
Vinzenz Schroeter
b715206b74 two gnome dconf settings 2025-09-16 19:46:39 +02:00
Vinzenz Schroeter
edb4ffcd4a merge default and configuration.nix 2025-09-16 19:29:09 +02:00
Vinzenz Schroeter
bd00284332 uxe nixpkgs lib to replace importDir 2025-09-15 23:30:28 +02:00
5 changed files with 91 additions and 87 deletions

View file

@ -132,17 +132,14 @@
pkgs = nixpkgs.legacyPackages.${system};
}
);
importModuleDir =
directory:
nixpkgs.lib.packagesFromDirectoryRecursive {
inherit directory;
callPackage = path: _args: path;
};
in
{
lib = {
importDir =
dir:
(lib.attrsets.mapAttrs' (
m: _:
lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; }
) (builtins.readDir dir));
};
overlays = {
unstable-packages = final: prev: {
unstable = import nixpkgs-unstable {
@ -151,7 +148,7 @@
};
};
nixosModules = (self.lib.importDir ./nixosModules) // {
nixosModules = (importModuleDir ./nixosModules) // {
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
@ -168,8 +165,11 @@
};
};
homeModules = self.lib.importDir ./homeModules;
homeConfigurations = self.lib.importDir ./homeConfigurations;
homeModules = importModuleDir ./homeModules;
homeConfigurations = {
vinzenz = ./homeConfigurations/vinzenz;
ronja = ./homeConfigurations/ronja;
};
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);

View file

@ -1,72 +0,0 @@
{ pkgs, ... }:
{
programs = {
home-manager.enable = true;
fzf.enable = true;
git-credential-oauth.enable = true;
direnv = {
enable = true;
nix-direnv.enable = true;
enableZshIntegration = true;
};
eza = {
enable = true;
git = true;
icons = "auto";
extraOptions = [
"--group-directories-first"
"--header"
];
};
thefuck = {
enable = true;
enableZshIntegration = true;
};
chromium.enable = true;
};
home.packages = with pkgs; [
keepassxc
telegram-desktop
element-desktop
wireguard-tools
wirelesstools
kdiff3
jetbrains-toolbox
blanket
vlc
ptyxis
arduino
arduino-ide
arduino-cli
servicepoint-cli
servicepoint-simulator
icu
nextcloud-client
lutris
foliate
];
home.file = {
"policy.json" = {
target = ".config/containers/policy.json";
text = builtins.readFile ./.config/containers/policy.json;
};
"idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
};
}

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{
imports = [
./configuration.nix
./editorconfig.nix
./fuzzel.nix
./git.nix
@ -12,4 +12,78 @@
./waybar.nix
./zsh.nix
];
config = {
programs = {
home-manager.enable = true;
fzf.enable = true;
git-credential-oauth.enable = true;
direnv = {
enable = true;
nix-direnv.enable = true;
enableZshIntegration = true;
};
eza = {
enable = true;
git = true;
icons = "auto";
extraOptions = [
"--group-directories-first"
"--header"
];
};
thefuck = {
enable = true;
enableZshIntegration = true;
};
chromium.enable = true;
};
home.packages = with pkgs; [
keepassxc
telegram-desktop
element-desktop
wireguard-tools
wirelesstools
kdiff3
jetbrains-toolbox
blanket
vlc
ptyxis
arduino
arduino-ide
arduino-cli
servicepoint-cli
servicepoint-simulator
icu
nextcloud-client
lutris
foliate
dconf2nix
];
home.file = {
"policy.json" = {
target = ".config/containers/policy.json";
text = builtins.readFile ./.config/containers/policy.json;
};
"idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
};
};
}

View file

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
{
config = {
home.packages = with pkgs; [
@ -26,6 +26,8 @@
switch-applications = [ "<Super>Tab" ];
switch-applications-backward = [ "<Shift><Super>Tab" ];
};
"org/gnome/desktop/session".idle-delay = lib.hm.gvariant.mkUint32 300;
"org/gnome/Connections".first-run = false;
};
};
}

View file

@ -3,4 +3,4 @@ set -euxo pipefail
nix fmt
nix flake check --all-systems --show-trace
nix flake check --show-trace