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 { in {
nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem { nixosConfigurations.thonkpad = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
baseModule baseModule
./hosts/thonkpad/configuration.nix ./hosts/thonkpad/configuration.nix

View File

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

View File

@@ -13,7 +13,6 @@
# ./nitrogen/defualt.nix # ./nitrogen/defualt.nix
./rofi/default.nix ./rofi/default.nix
./polybar/default.nix ./polybar/default.nix
# wm stuff # wm stuff
./sxhkd/default.nix ./sxhkd/default.nix
./bspwm/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, config,
pkgs, pkgs,
lib,
... ...
}: let }: let
pkg_with_working_nitrogen = import (builtins.fetchTarball { pkg_with_working_nitrogen = import (builtins.fetchTarball {
@@ -18,223 +16,229 @@ in {
../../system/system.nix ../../system/system.nix
]; ];
home-manager = { options.res = lib.mkOption {
useGlobalPkgs = true; type = lib.types.str;
useUserPackages = true; default = "1920x1080";
backupFileExtension = "hm-backup"; description = "screen resolution";
users.synchronous = import ../../home/home.nix;
}; };
environment.sessionVariables = { config = {
RES = "1366x768"; home-manager = {
}; useGlobalPkgs = true;
useUserPackages = true;
# Bootloader. backupFileExtension = "hm-backup";
# boot.loader.grub.enable = true; extraSpecialArgs = {inherit (config) res;};
# boot.loader.grub.device = "/dev/sda"; users.synchronous.imports = [
# boot.loader.grub.useOSProber = true; ({
# boot.loader.grub.version = 2; config,
#boot = { lib,
# loader.systemd-boot = { ...
# enable = true; }:
# editor = false; import ../../home/home.nix {
# }; inherit config pkgs lib;
# kernelPackages = pkgs.linuxPackages; })
#};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.grub.enable = false;
networking.hostName = "thonkpad"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
nix = {
nixPath = [
"nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=/home/synchronous/nix-cfg/configuration.nix"
"/nix/var/nix/profiles/per-user/root/channels"
];
settings = {
experimental-features = ["nix-command" "flakes"];
substituters = [
"https://nix-community.cachix.org"
]; ];
trusted-public-keys = [ # users.synchronous = import ../../home/home.nix {
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # inherit config lib pkgs;
# };
};
res = "1366x768";
# config = {
# res = "1366x768";
# };
# system.res = "1366x768";
# Bootloader.
# boot.loader.grub.enable = true;
# boot.loader.grub.device = "/dev/sda";
# boot.loader.grub.useOSProber = true;
# boot.loader.grub.version = 2;
#boot = {
# loader.systemd-boot = {
# enable = true;
# editor = false;
# };
# kernelPackages = pkgs.linuxPackages;
#};
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.grub.enable = false;
networking.hostName = "thonkpad"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
nix = {
nixPath = [
"nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=/home/synchronous/nix-cfg/configuration.nix"
"/nix/var/nix/profiles/per-user/root/channels"
];
settings = {
experimental-features = ["nix-command" "flakes"];
substituters = [
"https://nix-community.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "America/New_York";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# Enable CUPS to print documents.
services.printing.enable = true;
hardware.bluetooth.enable = true;
programs.dconf.enable = true;
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
users.users.synchronous = {
isNormalUser = true;
description = "jake";
extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [
kdePackages.kate
# firefox
git
arandr
procs
htop
zsh
ripgrep
rofi
alacritty
python3
tree
old-nitrogen
polybar
sxhkd
bspwm
# librewolf
eza
flameshot
neofetch
lolcat
nnn
xclip
brightnessctl
xbindkeys
pulseaudio
xorg.xf86inputsynaptics
libnotify # for notify-send
alejandra
discord
legcord
polybar-pulseaudio-control
bluez # polybar
zotero
texliveFull
texlivePackages.latexmk
nmap
procps # for pgrep
# xorg.xrandr
# thunderbird
]; ];
}; };
};
# Configure network proxy if necessary security.sudo = {
# networking.proxy.default = "http://user:password@proxy:port/"; # me ne frego. i dare you to privilege escalate me
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; enable = true;
extraRules = [
{
commands = [
{
command = "/home/synchronous/nix-cfg/home/scripts/nixos-rebuild.sh";
options = ["NOPASSWD"];
}
{
command = "/home/synchronous/.scripts/nixos-rebuild.sh";
options = ["NOPASSWD"];
}
{
# are you serious?
command = "/run/current-system/sw/bin/nixos-rebuild switch --flake /home/synchronous/nix-cfg/flake.nix";
options = ["NOPASSWD"];
}
];
users = ["synchronous"];
}
];
};
# Enable networking # Allow unfree packages
networking.networkmanager.enable = true; nixpkgs.config.allowUnfree = true;
# Set your time zone. # List packages installed in system profile. To search, run:
time.timeZone = "America/New_York"; # $ nix search wget
environment.systemPackages = with pkgs; [
# Select internationalisation properties. vim
i18n.defaultLocale = "en_US.UTF-8"; neovim
linux-manual
i18n.extraLocaleSettings = { man-pages
LC_ADDRESS = "en_US.UTF-8"; man-pages-posix
LC_IDENTIFICATION = "en_US.UTF-8"; fontconfig
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# Enable CUPS to print documents.
services.printing.enable = true;
hardware.bluetooth.enable = true;
programs.dconf.enable = true;
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
users.users.synchronous = {
isNormalUser = true;
description = "jake";
extraGroups = ["networkmanager" "wheel"];
packages = with pkgs; [
kdePackages.kate
# firefox
git
arandr
procs
htop
zsh
ripgrep
rofi
alacritty
python3 python3
rofi
flameshot
tree tree
old-nitrogen # nitrogen
polybar polybar
sxhkd sxhkd
bspwm bspwm
# librewolf # librewolf
eza
flameshot
neofetch
lolcat
nnn
xclip
brightnessctl
xbindkeys
pulseaudio
xorg.xf86inputsynaptics
libnotify # for notify-send
alejandra
discord
legcord
polybar-pulseaudio-control
bluez # polybar
zotero
texliveFull
texlivePackages.latexmk
nmap
procps # for pgrep
# xorg.xrandr
# thunderbird
]; ];
# 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
# this value at the release version of the first install of this system.
# 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?
}; };
security.sudo = {
# me ne frego. i dare you to privilege escalate me
enable = true;
extraRules = [
{
commands = [
{
command = "/home/synchronous/nix-cfg/home/scripts/nixos-rebuild.sh";
options = ["NOPASSWD"];
}
{
command = "/home/synchronous/.scripts/nixos-rebuild.sh";
options = ["NOPASSWD"];
}
{
# are you serious?
command = "/run/current-system/sw/bin/nixos-rebuild switch --flake /home/synchronous/nix-cfg/flake.nix";
options = ["NOPASSWD"];
}
];
users = ["synchronous"];
}
];
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
vim
neovim
linux-manual
man-pages
man-pages-posix
fontconfig
python3
rofi
flameshot
tree
# nitrogen
polybar
sxhkd
bspwm
# 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
# this value at the release version of the first install of this system.
# 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?
} }