27 current 2025-04-29 02:11:26 25.05.20250424.f771eb4 6.12.24 *

This commit is contained in:
2025-04-29 02:11:40 -04:00
parent b66aee780c
commit c7a6d42afc
4 changed files with 214 additions and 211 deletions

View File

@@ -35,6 +35,7 @@
in {
nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
baseModule
./hosts/thonkpad/configuration.nix

View File

@@ -2,6 +2,7 @@
config,
pkgs,
lib,
osConfig,
...
}: let
mypolybar = pkgs.polybar.override {
@@ -37,8 +38,6 @@
# ${ip} route | ${grep} default | ${awk} '{print $5}' > $out
# '';
res = builtins.getEnv "RES";
hd = ''
[bar/mybar]
height = 20
@@ -64,9 +63,9 @@
'';
mon =
if res == "1366x768"
if osConfig.res == "1366x768"
then hd
else if res == "2560x1440"
else if osConfig.res == "2560x1440"
then qhd
else fhd;

View File

@@ -13,7 +13,6 @@
# ./nitrogen/defualt.nix
./rofi/default.nix
./polybar/default.nix
# wm stuff
./sxhkd/default.nix
./bspwm/default.nix

View File

@@ -1,9 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{
config,
pkgs,
lib,
...
}: let
pkg_with_working_nitrogen = import (builtins.fetchTarball {
@@ -18,16 +16,40 @@ in {
../../system/system.nix
];
options.res = lib.mkOption {
type = lib.types.str;
default = "1920x1080";
description = "screen resolution";
};
config = {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "hm-backup";
users.synchronous = import ../../home/home.nix;
extraSpecialArgs = {inherit (config) res;};
users.synchronous.imports = [
({
config,
lib,
...
}:
import ../../home/home.nix {
inherit config pkgs lib;
})
];
# users.synchronous = import ../../home/home.nix {
# inherit config lib pkgs;
# };
};
environment.sessionVariables = {
RES = "1366x768";
};
res = "1366x768";
# config = {
# res = "1366x768";
# };
# system.res = "1366x768";
# Bootloader.
# boot.loader.grub.enable = true;
@@ -211,25 +233,6 @@ in {
# librewolf
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. Its perfectly fine and recommended to leave
@@ -237,4 +240,5 @@ in {
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment?
};
}