Xetibo/DashNix
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
DashieTM 2024-07-06 22:58:41 +02:00
parent f5bc289708
commit 791e2a69dd
14 changed files with 46 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/base/common_hardware.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, username, ... }:
{ {
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -51,14 +51,14 @@
}; };
nix.settings.trusted-users = [ nix.settings.trusted-users = [
"dashie" username
]; ];
# allows user change later on # allows user change later on
users.mutableUsers = true; users.mutableUsers = true;
users.users.dashie = { users.users.${username} = {
isNormalUser = true; isNormalUser = true;
description = "dashie"; description = username;
extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" "vboxusers" ]; extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" "vboxusers" ];
packages = with pkgs; [ packages = with pkgs; [
home-manager home-manager

3
nix/base/env.nix
View file

@ -1,4 +1,5 @@
{ pkgs { pkgs
, username
, ... , ...
}: { }: {
environment.variables = { environment.variables = {
@ -12,7 +13,7 @@
environment.sessionVariables = { environment.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
GOPATH = "$HOME/.go"; GOPATH = "$HOME/.go";
FLAKE = "home/dashie/gits/dotFiles/nix"; FLAKE = "home/${username}/gits/dotFiles/nix";
# don't ask... marksman somehow requires this # don't ask... marksman somehow requires this
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1;
}; };

11
nix/base/login_manager.nix
View file

@ -1,16 +1,13 @@
{ inputs { lib
, lib
, config , config
, pkgs , pkgs
, username
, ... , ...
}: }:
let let
regreet_override = pkgs.greetd.regreet.overrideAttrs (final: prev: {
SESSION_DIRS = "${config.services.xserver.displayManager.sessionData.desktops}/share";
});
session = { session = {
command = "${lib.getExe pkgs.hyprland} --config /etc/greetd/hyprgreet.conf"; command = "${lib.getExe pkgs.hyprland} --config /etc/greetd/hyprgreet.conf";
user = "dashie"; user = username;
}; };
in in
{ {
@ -53,7 +50,7 @@ in
disable_hyprland_logo = true disable_hyprland_logo = true
} }
exec-once=regreet --style /home/dashie/.config/gtk-3.0/gtk.css; hyprctl dispatch exit exec-once=regreet --style /home/${username}/.config/gtk-3.0/gtk.css; hyprctl dispatch exit
''; '';
# unlock GPG keyring on login # unlock GPG keyring on login

7
nix/flake.nix
View file

@ -55,11 +55,12 @@
./base/default.nix ./base/default.nix
./programs ./programs
]; ];
username = "dashie";
in in
{ {
nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs pkgs; inherit inputs pkgs username;
mod = ./hardware/marmo/base_config.nix; mod = ./hardware/marmo/base_config.nix;
}; };
modules = [ modules = [
@ -69,7 +70,7 @@
}; };
nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs pkgs; inherit inputs pkgs username;
mod = ./hardware/overheating/base_config.nix; mod = ./hardware/overheating/base_config.nix;
}; };
modules = [ modules = [
@ -78,7 +79,7 @@
}; };
nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs pkgs; inherit inputs pkgs username;
mod = ./hardware/spaceship/base_config.nix; mod = ./hardware/spaceship/base_config.nix;
}; };
modules = [ modules = [

14
nix/hardware/spaceship/base_config.nix
View file

@ -1,4 +1,4 @@
{ { username, ... }: {
imports = [ imports = [
../../modules ../../modules
]; ];
@ -33,14 +33,14 @@
programs.ironbar.monitor = "DP-1"; programs.ironbar.monitor = "DP-1";
programs.hyprland.hyprpaper = '' programs.hyprland.hyprpaper = ''
#load #load
preload = /home/dashie/Pictures/backgrounds/shinobu_2k.jpg preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
preload = /home/dashie/Pictures/backgrounds/shino_wide.png preload = /home/${username}/Pictures/backgrounds/shino_wide.png
preload = /home/dashie/Pictures/backgrounds/shinobu_1200.jpg preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
#set #set
wallpaper = DP-2,/home/dashie/Pictures/backgrounds/shinobu_2k.jpg wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
wallpaper = DP-1,/home/dashie/Pictures/backgrounds/shino_wide.png wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
splash = true splash = true
''; '';
programs.hyprland.extra_autostart = [ "streamdeck -n" ]; programs.hyprland.extra_autostart = [ "streamdeck -n" ];

9
nix/programs/common.nix
View file

@ -1,6 +1,7 @@
{ pkgs { pkgs
, inputs , inputs
, lib , lib
, username
, ... , ...
}: }:
let callPackage = lib.callPackageWith (pkgs); let callPackage = lib.callPackageWith (pkgs);
@ -74,14 +75,14 @@ in
]; ];
programs.ReSet.config.plugin_config = { programs.ReSet.config.plugin_config = {
Keyboard = { Keyboard = {
path = "/home/dashie/.config/reset/keyboard.conf"; path = "/home/${username}/.config/reset/keyboard.conf";
}; };
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
home.username = "dashie"; home.username = username;
home.homeDirectory = "/home/dashie"; home.homeDirectory = "/home/${username}";
home.stateVersion = "24.05"; home.stateVersion = "24.05";
home.sessionPath = [ home.sessionPath = [
@ -122,7 +123,7 @@ in
defaultSopsFile = ../secrets/secrets.yaml; defaultSopsFile = ../secrets/secrets.yaml;
secrets.hub = { }; secrets.hub = { };
secrets.lab = { }; secrets.lab = { };
secrets.dashie = { }; secrets.${username} = { };
}; };
systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ]; systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
} }

6
nix/programs/default.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, mod, ... }: { inputs, pkgs, mod, username, ... }:
let let
base_imports = [ base_imports = [
inputs.anyrun.homeManagerModules.default inputs.anyrun.homeManagerModules.default
@ -26,10 +26,10 @@ in
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.dashie = { home-manager.users.${username} = {
imports = [ imports = [
{ {
_module = { args = { inherit inputs; }; }; _module = { args = { inherit inputs username; }; };
} }
./hyprland/default.nix ./hyprland/default.nix
./flatpak.nix ./flatpak.nix

3
nix/programs/hyprland/config.nix
View file

@ -1,5 +1,6 @@
{ pkgs { pkgs
, inputs , inputs
, username
, config , config
, ... , ...
}: }:
@ -7,7 +8,7 @@
wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
"source" = "/home/dashie/.config/reset/keyboard.conf"; "source" = "/home/${username}/.config/reset/keyboard.conf";
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"

10
nix/programs/hyprland/ironbar.nix
View file

@ -1,10 +1,10 @@
{ config, ... }: { { config, username, ... }: {
programs.ironbar = programs.ironbar =
{ {
enable = true; enable = true;
style = '' style = ''
@import url("/home/dashie/.config/gtk-3.0/gtk.css"); @import url("/home/${username}/.config/gtk-3.0/gtk.css");
* { * {
color: #71bbe6; color: #71bbe6;
@ -176,13 +176,13 @@
type = "button"; type = "button";
class = "audio-button"; class = "audio-button";
label = ""; label = "";
on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh bluetooth"; on_click = "!/home/${username}/.config/eww/scripts/audio_control.sh bluetooth";
} }
{ {
type = "button"; type = "button";
class = "audio-button"; class = "audio-button";
label = "󰋋"; label = "󰋋";
on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh internal"; on_click = "!/home/${username}/.config/eww/scripts/audio_control.sh internal";
} }
]; ];
class = "audio-button-box"; class = "audio-button-box";
@ -222,7 +222,7 @@
type = "button"; type = "button";
class = "popup-button"; class = "popup-button";
label = ""; label = "";
on_click = "!oxidash --css /home/dashie/gits/oxidash/style.css"; on_click = "!oxidash --css /home/${username}/gits/oxidash/style.css";
} }
]; ];
class = "popup-button-box"; class = "popup-button-box";

4
nix/programs/individual_configs/firefox.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, username, ... }: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
@ -13,7 +13,7 @@
DisplayBookmarksToolbar = "never"; DisplayBookmarksToolbar = "never";
DisplayMenuBar = "default-off"; DisplayMenuBar = "default-off";
}; };
profiles.dashie = { profiles.${username} = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin ublock-origin
darkreader darkreader

4
nix/programs/individual_configs/fish.nix
View file

@ -1,4 +1,4 @@
{ { username, ... }: {
xdg.configFile."fish/config.fish" = { xdg.configFile."fish/config.fish" = {
text = text =
'' ''
@ -15,7 +15,7 @@
set EDITOR "neovide --no-fork" set EDITOR "neovide --no-fork"
alias rebuild='sudo nixos-rebuild switch --flake /home/dashie/gits/dotFiles/nix/.' alias rebuild='sudo nixos-rebuild switch --flake /home/${username}/gits/dotFiles/nix/.'
abbr --add ls 'lsd' abbr --add ls 'lsd'
abbr --add :q 'exit' abbr --add :q 'exit'
abbr --add gh 'git push origin' abbr --add gh 'git push origin'

1
nix/programs/media.nix
View file

@ -27,7 +27,6 @@
gimp gimp
krita krita
yt-dlp yt-dlp
spotdl
]; ];
programs.obs-studio.enable = true; programs.obs-studio.enable = true;
programs.obs-studio.plugins = with pkgs; [ programs.obs-studio.plugins = with pkgs; [

4
nix/programs/oxi/oxinoti.nix
View file

@ -1,8 +1,8 @@
{ { username, ... }: {
xdg.configFile."oxinoti/style.css" = { xdg.configFile."oxinoti/style.css" = {
text = /*css*/ text = /*css*/
'' ''
@import url("/home/dashie/.config/gtk-3.0/gtk.css"); @import url("/home/${username}/.config/gtk-3.0/gtk.css");
#MainWindow { #MainWindow {
background-color: transparent; background-color: transparent;

7
nix/programs/themes/qt.nix
View file

@ -1,3 +1,4 @@
{ username, ... }:
let let
color = '' color = ''
[ColorScheme] [ColorScheme]
@ -28,7 +29,7 @@ in
text = text =
'' ''
[Appearance] [Appearance]
color_scheme_path=/home/dashie/.config/qt5ct/colors/tokyonight.conf color_scheme_path=/home/${username}/.config/qt5ct/colors/tokyonight.conf
custom_palette=true custom_palette=true
icon_theme=MoreWaita icon_theme=MoreWaita
standard_dialogs=gtk3 standard_dialogs=gtk3
@ -48,7 +49,7 @@ in
keyboard_scheme=4 keyboard_scheme=4
menus_have_icons=true menus_have_icons=true
show_shortcuts_in_context_menus=true show_shortcuts_in_context_menus=true
stylesheets=/home/dashie/.config/qt5ct/qss/tab.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/fusion-fixes.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/scrollbar-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/sliders-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/tooltip-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/traynotification-simple.qss stylesheets=/home/${username}/.config/qt5ct/qss/tab.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/fusion-fixes.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/scrollbar-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/sliders-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/tooltip-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/traynotification-simple.qss
toolbutton_style=4 toolbutton_style=4
underline_shortcut=0 underline_shortcut=0
wheel_scroll_lines=3 wheel_scroll_lines=3
@ -65,7 +66,7 @@ in
text = text =
'' ''
[Appearance] [Appearance]
color_scheme_path=/home/dashie/.config/qt6ct/colors/toykonight.conf color_scheme_path=/home/${username}/.config/qt6ct/colors/toykonight.conf
custom_palette=true custom_palette=true
standard_dialogs=default standard_dialogs=default
style=Adwaita-Dark style=Adwaita-Dark