refactor: clean up config

This commit is contained in:
2025-11-21 18:39:22 +01:00
parent 09bfb81cd8
commit edab660ee9
3 changed files with 38 additions and 72 deletions

View File

@@ -2,25 +2,34 @@
description = "0x29a NixOS flake config"; description = "0x29a NixOS flake config";
inputs = { inputs = {
# the main nix package collection
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs/nixos-unstable"; url = "github:nixos/nixpkgs/nixos-unstable";
}; };
# home manager for dotfiles
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: { outputs = { self, nixpkgs, home-manager, ... }@inputs: {
# nixos system config
nixosConfigurations.default = nixpkgs.lib.nixosSystem { nixosConfigurations.default = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
# import host specific configs
./hosts/default/configuration.nix ./hosts/default/configuration.nix
# import host specific hardware configs
./hosts/default/hardware-configuration.nix ./hosts/default/hardware-configuration.nix
{ home-manager.users.aaron = import ./hosts/default/home.nix; }
home-manager.nixosModules.default
]; ];
}; };
}; };
} }

View File

@@ -58,23 +58,28 @@
keyMap = "de_CH-latin1"; keyMap = "de_CH-latin1";
}; };
# xserver config # window manager configs
services.xserver = { services.xserver = {
enable = true; enable = true;
xkb.layout = "ch"; xkb.layout = "ch";
xkb.options = "eurosign:e,caps:escape"; xkb.options = "eurosign:e,caps:escape";
windowManager.i3 = {
windowManager.qtile = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = python3Packages: with python3Packages; [
dmenu qtile-extras
i3status
]; ];
}; };
}; };
# window manager configs #services.displayManager.lightdm.enable = true;
services.displayManager.defaultSession = "none+i3"; #services.desktopManager.session = [ {
programs.i3lock.enable = true; # name = "qtile";
# start = ''
# exec ${pkgs.qtile}/bin/qtile start
# '';
#} ];
environment.pathsToLink = [ "/libexec" ]; environment.pathsToLink = [ "/libexec" ];
environment.variables.EDITOR = "vim"; environment.variables.EDITOR = "vim";

View File

@@ -1,39 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, inputs, ... }:
{ {
# Home Manager needs a bit of information about you and the paths it should # user config
# manage.
home.username = "aaron"; home.username = "aaron";
home.homeDirectory = "/home/aaron"; home.homeDirectory = "/home/aaron";
# This value determines the Home Manager release that your configuration is # packages
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "25.05"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = with pkgs; [ home.packages = with pkgs; [
# # Adds the 'hello' command to your environment. It prints a friendly
# # "Hello, world!" when run.
# pkgs.hello
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
fastfetch fastfetch
zip zip
xz xz
@@ -72,41 +45,20 @@
userEmail = "aaron@0x29a.ch"; userEmail = "aaron@0x29a.ch";
}; };
# Home Manager is pretty good at managing dotfiles. The primary way to manage # deploy qtile config
# plain files is through 'home.file'. home.file."qtile-config" = {
home.file = { target = ".config/qtile/config.py";
# # Building this configuration will create a copy of 'dotfiles/screenrc' in source = "${inputs.qtile-config}/qtile_config/config.py";
# # the Nix store. Activating the configuration will then make '~/.screenrc' a force = true;
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
}; };
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. These will be explicitly sourced when using a
# shell provided by Home Manager. If you don't want to manage your shell
# through Home Manager then you have to manually source 'hm-session-vars.sh'
# located at either
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/aaron/etc/profile.d/hm-session-vars.sh
#
home.sessionVariables = { home.sessionVariables = {
# EDITOR = "emacs"; EDITOR = "vim";
}; };
# Let Home Manager install and manage itself. # enable home manager
programs.home-manager.enable = true; programs.home-manager.enable = true;
# don't change
home.stateVersion = "25.05";
} }