kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more reorganizing

Browse Source
This commit is contained in:
Kopatz
2023-12-11 21:46:42 +01:00
parent 5d29130cf9
commit 05ea1b46c7
11 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@@ -37,6 +37,7 @@
modules = [
### User specific ###
./users/anon.nix
./users/option.nix
### System sepecific ###
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./systems/server/configuration.nix
@@ -99,7 +100,10 @@
inherit inputs ;
};
modules = [
### User specific ###
./users/option.nix
./users/kopatz.nix
### System modules ###
./modules/graphical/plasma.nix
./modules/graphical/hyprland.nix
./modules/graphical/emulators.nix
@@ -138,6 +142,8 @@
inherit inputs;
};
modules = [
### User specific ###
./users/option.nix
./users/kopatz.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
# Todo: refactor file layout
@@ -168,6 +174,8 @@
inherit inputs ;
};
modules = [
### User specific ###
./users/option.nix
./users/kopatz.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./laptop/configuration.nix

6
home-manager/hyprland-settings.nix
View File

@@ -1,4 +1,4 @@
{ user, pkgs, vars, ... }:
{ user, pkgs, layout, variant, ... }:
{
home-manager.users.${user} = {
programs.swaylock.enable = true;
@@ -33,8 +33,8 @@
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input = {
kb_layout = vars.layout;
kb_variant = vars.variant;
kb_layout = layout;
kb_variant = variant;
kb_model = "";
kb_options = "";
kb_rules = "";

10
modules/graphical/hyprland.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, vars, ... }:
{ config, pkgs, lib, inputs, ... }:
let
patchedWaybar = pkgs.waybar.overrideAttrs (oldAttrs: {
@@ -11,14 +11,14 @@ let
in
{
imports = [
(import ../../home-manager/hyprland-settings.nix ({ user="${vars.user}"; pkgs = pkgs; inherit vars; }))
(import ../../home-manager/hyprland-settings.nix ({ user="${config.mainUser.name}"; pkgs = pkgs; layout = config.mainUser.layout; variant = config.mainUser.variant; }))
];
services.xserver = {
layout = vars.layout;
xkbVariant = vars.variant;
layout = config.mainUser.layout;
xkbVariant = config.mainUser.variant;
enable = true;
displayManager = lib.mkIf (!config.services.xserver.displayManager.gdm.enable) {
displayManager = lib.mkIf (!config.services.xserver.displayManager.gdm.enable) {
sddm.enable = true;
};
};

1
systems/laptop/userdata.nix
View File

@@ -3,5 +3,4 @@
ipv4 = "192.168.0.4";
dns = "192.168.0.6";
wm = "gnome-shell";
user = "kopatz";
}

3
systems/pc/configuration.nix
View File

@@ -10,6 +10,9 @@
./hardware-configuration.nix
];
mainUser.layout = "de";
mainUser.variant = "us";
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

4
systems/pc/userdata.nix
View File

@@ -1,6 +1,4 @@
{
layout = "de";
variant = "us";
user = "kopatz";
}

1
systems/server/userdata.nix
View File

@@ -4,7 +4,6 @@
dns = "127.0.0.1";
wireguardIp = "192.168.2.1";
wm = "startplasma-x11";
user = "anon";
udpRanges = [
#{
# from = 52000;

4
systems/userdata-default.nix
View File

@@ -1,5 +1,3 @@
{
layout = "de";
variant = "";
user = "kopatz";
}

2
users/anon.nix
View File

@@ -8,7 +8,7 @@ in
(import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
(import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
];
vars.user = user;
mainUser.name = user;
home-manager = {
useGlobalPkgs = true;

1
users/kopatz.nix
View File

@@ -12,6 +12,7 @@ in
(import ../home-manager/lf.nix ({ user="${user}"; pkgs = pkgs; }))
];
mainUser.name = user;
home-manager = {
useGlobalPkgs = true;
extraSpecialArgs = {

19
users/option.nix Normal file
View File

@@ -0,0 +1,19 @@
{lib, config, pkgs, ...}:
{
options.mainUser = {
name = lib.mkOption {
default = "mainuser";
description = ''
username
'';
};
layout = lib.mkOption {
default = "de";
description = "keyboard layout";
};
variant = lib.mkOption {
default = "";
description = "keyboard variant";
};
};
}