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

update polybar config, set alacritty size for 2k screen add steam and heroic games launcher

Browse Source
This commit is contained in:
tomoron
2024-10-17 15:56:23 +02:00
parent 20f87b132b
commit af79ebb579
11 changed files with 77 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile Normal file
View File

@ -0,0 +1,15 @@
HOST ?= $(file < /etc/nixosFlakeName)
THREADS ?= $(shell nproc)
FLAKE ?= /home/tom/home
MODE = switch
all: os home
update:
cd $(FLAKE);nix flake update
$(MAKE) all
os:
sudo nixos-rebuild $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST)
home :
home-manager $(MODE) --cores $(THREADS) -j $(THREADS) --flake $(FLAKE)#$(HOST)

7
configuration.nix
View File

@ -1,7 +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, on # Edit this configuration file to define what should be installed on your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, inputs, pkgs, ... }: { config, lib, inputs, pkgs, flakeName, ... }:
{ {
# imports = []; # imports = [];
@ -46,6 +46,9 @@
killall killall
vim vim
pciutils pciutils
pigz
htop
gnumake
]; ];
#Open ports in the firewall. #Open ports in the firewall.
@ -56,4 +59,6 @@
system.stateVersion = "24.05"; # Did you read the comment? system.stateVersion = "24.05"; # Did you read the comment?
environment.etc.nixosFlakeName.text = "${flakeName}";
} }

4
dotfiles/config/polybar/config-small.ini
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/28 20:38:59 by tomoron #+# #+# # # Created: 2024/08/28 20:38:59 by tomoron #+# #+# #
# Updated: 2024/09/30 16:01:08 by tomoron ### ########.fr # # Updated: 2024/10/16 22:18:29 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -144,7 +144,7 @@ font-2 = "Iosevka Nerd Font:style=Bold:pixelsize=15;4"
modules-left = workspaces space mpris modules-left = workspaces space mpris
modules-center = modules-center =
modules-right = fans dgpu memory sep filesystem sep cpu sep temperature sep pulseaudio sep battery sep network sep date modules-right = fans dgpu memory sep filesystem sep cpu sep temperature sep polybar sep battery sep network sep date
;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

2
dotfiles/config/polybar/config.ini
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/28 20:38:59 by tomoron #+# #+# # # Created: 2024/08/28 20:38:59 by tomoron #+# #+# #
# Updated: 2024/09/28 02:47:34 by tomoron ### ########.fr # # Updated: 2024/10/16 22:02:20 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #

6
dotfiles/config/polybar/modules.ini
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/28 20:38:49 by tomoron #+# #+# # # Created: 2024/08/28 20:38:49 by tomoron #+# #+# #
# Updated: 2024/09/30 16:01:01 by tomoron ### ########.fr # # Updated: 2024/10/16 22:55:55 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -385,7 +385,7 @@ label = " %percentage_used%%"
; If you use both a wired and a wireless network, just add 2 module definitions. For example ; If you use both a wired and a wireless network, just add 2 module definitions. For example
[module/network] [module/network]
type = internal/network type = internal/network
interface = wlan0 interface = wlp2s0
; Seconds to sleep between updates ; Seconds to sleep between updates
; Default: 1 ; Default: 1
@ -498,7 +498,7 @@ thermal-zone = 0
; to find path to desired file ; to find path to desired file
; Default reverts to thermal zone setting ; Default reverts to thermal zone setting
;;hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input ;;hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
hwmon-path = /sys/devices/virtual/thermal/thermal_zone0/hwmon1/temp1_input hwmon-path = /sys/devices/virtual/thermal/thermal_zone0/temp
; Threshold temperature to display warning label (in degrees celsius) ; Threshold temperature to display warning label (in degrees celsius)
; Default: 80 ; Default: 80

12
flake.lock generated
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728306985, "lastModified": 1729165983,
"narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", "narHash": "sha256-gtcodl79t5ZbbX4TSx4RNyggasEvLdVnc/IM+RyxqJw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", "rev": "78a7a070bbcc3b37cc36080c2a3514207d427b3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1728888510,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View File

@ -19,14 +19,14 @@
#NIXOS CONFIG #NIXOS CONFIG
nixosConfigurations = { nixosConfigurations = {
default = nixpkgs.lib.nixosSystem { default = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs; flakeName="default";};
modules = [ modules = [
./hardware-configuration.nix ./hardware-configuration.nix
./configuration.nix ./configuration.nix
]; ];
}; };
vbox = nixpkgs.lib.nixosSystem { vbox = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;flakeName="vbox";};
modules = [ modules = [
./hardware-configuration.nix ./hardware-configuration.nix
./configuration.nix ./configuration.nix
@ -34,7 +34,7 @@
]; ];
}; };
laptop = nixpkgs.lib.nixosSystem { laptop = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;flakeName="laptop";};
modules = [ modules = [
./hardware-configuration.nix ./hardware-configuration.nix
./configuration.nix ./configuration.nix
@ -75,6 +75,17 @@
./home.nix ./home.nix
./homes/ft/ft.nix ./homes/ft/ft.nix
]; ];
};
laptop = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
username = "${username}";
homeDir = "${homeDir}";
};
modules = [
./home.nix
./homes/laptop/laptop.nix
];
}; };
}; };
}; };

10
home.nix
View File

@ -9,7 +9,7 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = with pkgs;[ home.packages = with pkgs;[
polybar polybarFull
sxhkd sxhkd
alacritty alacritty
nitrogen nitrogen
@ -28,7 +28,7 @@
".config/sxhkd".source = lib.mkDefault dotfiles/config/sxhkd; ".config/sxhkd".source = lib.mkDefault dotfiles/config/sxhkd;
".config/polybar".source = dotfiles/config/polybar; ".config/polybar".source = dotfiles/config/polybar;
".config/nitrogen".source = lib.mkDefault dotfiles/config/nitrogen; ".config/nitrogen".source = lib.mkDefault dotfiles/config/nitrogen;
".config/alacritty".source = dotfiles/config/alacritty; ".config/alacritty".source = lib.mkDefault dotfiles/config/alacritty;
".config/nvim/init.vim".source = dotfiles/config/nvim/init.vim; ".config/nvim/init.vim".source = dotfiles/config/nvim/init.vim;
".config/nvim/plugin/stdheader.vim".source = dotfiles/config/nvim/plugin/stdheader.vim; ".config/nvim/plugin/stdheader.vim".source = dotfiles/config/nvim/plugin/stdheader.vim;
".local/share/nvim/site/autoload/plug.vim".source = dotfiles/local/share/nvim/site/autoload/plug.vim; ".local/share/nvim/site/autoload/plug.vim".source = dotfiles/local/share/nvim/site/autoload/plug.vim;
@ -36,6 +36,12 @@
".vimrc".source = dotfiles/vimrc; ".vimrc".source = dotfiles/vimrc;
".bashrc".source = dotfiles/bashrc; ".bashrc".source = dotfiles/bashrc;
".local/share/rofi/themes".source = "${builtins.fetchGit {
url = "https://github.com/newmanls/rofi-themes-collection";
rev = "c8239a45edced3502894e1716a8b661fdea8f1c9";
ref = "master";
}}/themes";
# ".gradle/gradle.properties".text = '' # ".gradle/gradle.properties".text = ''
# org.gradle.daemon.idletimeout=3600000 # org.gradle.daemon.idletimeout=3600000

8
homes/laptop/dotfiles/config/alacritty/alacritty.toml Normal file
View File

@ -0,0 +1,8 @@
[window]
opacity = 0.90
[env]
XTERM = "xterm-256color"
[font]
size = 8

9
homes/laptop/laptop.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, lib, pkgs, ... }:
{
home.packages = with pkgs;[ heroic ];
services.picom.package = pkgs.picom-pijulius;
home.file = {
".config/alacritty".source = dotfiles/config/alacritty;
};
}

6
hosts/laptop/configuration.nix
View File

@ -11,9 +11,9 @@
tlp tlp
]; ];
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport32Bit = true; enable32Bit = true;
}; };
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
@ -22,4 +22,6 @@
enable = true; enable = true;
enableOffloadCmd = true; enableOffloadCmd = true;
}; };
programs.steam.enable=true;
programs.steam.protontricks.enable=true;
} }