Faris/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor updates

Browse Source
This commit is contained in:
Faris 2026-06-03 19:14:43 +01:00
parent b195dc5697
commit ff5aba44d3
5 changed files with 185 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/common.nix
View File

@ -75,6 +75,7 @@
usbutils # lsusb usbutils # lsusb
wget wget
zsh zsh
android-tools
# media # media
yt-dlp yt-dlp

178
config/desktop.nix
View File

@ -12,7 +12,8 @@
qt.platformTheme = "gnome"; qt.platformTheme = "gnome";
#hyprland #hyprland
services.displayManager.gdm.enable = true; # use sddm until gnome 50 due to https://github.com/systemd/systemd/issues/39259 services.displayManager.sddm.enable = true; # use sddm until gnome 50 due to https://github.com/systemd/systemd/issues/39259
services.displayManager.sddm.wayland.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;
@ -47,12 +48,11 @@
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "cuda";
openFirewall = true; openFirewall = true;
host = "0.0.0.0"; host = "0.0.0.0";
# Optional: preload models, see https://ollama.com/library # Optional: preload models, see https://ollama.com/library
loadModels = [ "gemma4" ]; loadModels = [ "gemma4" ];
package = pkgs.unstable.ollama; package = pkgs.ollama-cuda;
}; };
@ -100,33 +100,33 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
brave brave
firefox firefox
#blender blender
#audacity audacity
#orca-slicer orca-slicer
#gimp gimp
#inkscape inkscape
#unstable.protonmail-desktop unstable.protonmail-desktop
#bitwarden-desktop #bitwarden-desktop
#libreoffice libreoffice
#freecad freecad
#kiwix kiwix
#obs-studio obs-studio
#obsidian obsidian
unstable.proton-authenticator unstable.proton-authenticator
#prismlauncher prismlauncher
#unstable.signal-desktop unstable.signal-desktop
tor-browser tor-browser
#wireshark wireshark
#monero-gui monero-gui
#moonlight-qt moonlight-qt
nvtopPackages.nvidia nvtopPackages.nvidia
dconf-editor dconf-editor
#kdePackages.kdenlive kdePackages.kdenlive
#element-desktop element-desktop
#chirp chirp
scrcpy scrcpy
veracrypt veracrypt
#lmms lmms
restic-browser restic-browser
# games # games
@ -144,20 +144,20 @@
#zeroad #0ad #zeroad #0ad
# game utils # game utils
mangohud #mangohud
umu-launcher #umu-launcher
# emu # emu
#ryubing #ryubing
#xemu #xemu
xenia-canary #xenia-canary
#retroarch-full #retroarch-full
#rpcs3 #rpcs3
#dolphin-emu #dolphin-emu
#cemu #cemu
# backup # backup
#keepassxc keepassxc
]; ];
fonts.fontconfig = { fonts.fontconfig = {
@ -181,8 +181,6 @@
services.hardware.openrgb.package = pkgs.openrgb-with-all-plugins; services.hardware.openrgb.package = pkgs.openrgb-with-all-plugins;
programs = { programs = {
adb.enable = true;
localsend = { localsend = {
@ -196,7 +194,7 @@
gamescope = { gamescope = {
enable = true; enable = true;
capSysNice = true; #capSysNice = true;
}; };
steam = { steam = {
@ -244,69 +242,69 @@
[ "${automount_opts},credentials=/etc/nixos/smb-credentials,uid=1000,gid=1000" ]; [ "${automount_opts},credentials=/etc/nixos/smb-credentials,uid=1000,gid=1000" ];
}; };
programs.virt-manager.enable = true; #programs.virt-manager.enable = true;
users.groups.libvirtd.members = [ "admin" ]; #users.groups.libvirtd.members = [ "admin" ];
virtualisation.libvirtd = { #virtualisation.libvirtd = {
enable = true; # enable = true;
qemu.swtpm.enable = true; # qemu.swtpm.enable = true;
}; #};
virtualisation.spiceUSBRedirection.enable = true; #virtualisation.spiceUSBRedirection.enable = true;
imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ]; imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ];
services.flatpak = { #services.flatpak = {
enable = true; # enable = true;
update.auto = { # update.auto = {
enable = true; # enable = true;
onCalendar = "weekly"; # Default value # onCalendar = "weekly"; # Default value
}; # };
packages = [ # packages = [
"com.bitwarden.desktop" # "com.bitwarden.desktop"
"com.orcaslicer.OrcaSlicer" # "com.orcaslicer.OrcaSlicer"
"me.proton.Mail" # "me.proton.Mail"
"org.audacityteam.Audacity" # "org.audacityteam.Audacity"
"org.blender.Blender" # "org.blender.Blender"
"org.freecad.FreeCAD" # "org.freecad.FreeCAD"
"org.gimp.GIMP" # "org.gimp.GIMP"
"org.inkscape.Inkscape" # "org.inkscape.Inkscape"
"org.kiwix.desktop" # "org.kiwix.desktop"
"org.libreoffice.LibreOffice" # "org.libreoffice.LibreOffice"
"md.obsidian.Obsidian" # "md.obsidian.Obsidian"
"com.obsproject.Studio" # "com.obsproject.Studio"
"org.prismlauncher.PrismLauncher" # "org.prismlauncher.PrismLauncher"
"org.signal.Signal" # "org.signal.Signal"
"org.wireshark.Wireshark" # "org.wireshark.Wireshark"
"org.getmonero.Monero" # "org.getmonero.Monero"
"com.moonlight_stream.Moonlight" # "com.moonlight_stream.Moonlight"
"org.kde.kdenlive" # "org.kde.kdenlive"
"im.riot.Riot" # "im.riot.Riot"
"com.chirpmyradio.chirp" # "com.chirpmyradio.chirp"
"io.lmms.LMMS" # "io.lmms.LMMS"
# games # # games
"com.github.Anuken.Mindustry" # "com.github.Anuken.Mindustry"
"com.play0ad.zeroad" # "com.play0ad.zeroad"
"io.github.endless_sky.endless_sky" # "io.github.endless_sky.endless_sky"
"io.github.spacingbat3.webcord" # "io.github.spacingbat3.webcord"
"io.github.yairm210.unciv" # "io.github.yairm210.unciv"
"io.openrct2.OpenRCT2" # "io.openrct2.OpenRCT2"
"net.runelite.RuneLite" # "net.runelite.RuneLite"
"org.cataclysmdda.CataclysmDDA" # "org.cataclysmdda.CataclysmDDA"
"org.openttd.OpenTTD" # "org.openttd.OpenTTD"
"org.wesnoth.Wesnoth" # "org.wesnoth.Wesnoth"
"org.xonotic.Xonotic" # "org.xonotic.Xonotic"
"sh.ppy.osu" # "sh.ppy.osu"
#
# # emu
# "io.github.ryubing.Ryujinx"
# "app.xemu.xemu"
# "net.rpcs3.RPCS3"
# "org.DolphinEmu.dolphin-emu"
# "info.cemu.Cemu"
# emu # # backup
"io.github.ryubing.Ryujinx" # "org.keepassxc.KeePassXC"
"app.xemu.xemu" #
"net.rpcs3.RPCS3" # ];
"org.DolphinEmu.dolphin-emu" #};
"info.cemu.Cemu"
# backup
"org.keepassxc.KeePassXC"
];
};
} }

278
home/hyprland.nix
View File

@ -359,7 +359,7 @@ in
"custom/menu" = { "custom/menu" = {
format = ""; format = "";
on-click = "walker"; on-click = "rofi -show drun";
}; };
"custom/expand" = { "custom/expand" = {
@ -439,150 +439,6 @@ in
}; };
}; };
}; };
services.walker = {
enable = true;
systemd.enable = true;
settings = {
app_launch_prefix = "";
as_window = false;
close_when_open = false;
disable_click_to_close = false;
force_keyboard_focus = false;
hotreload_theme = false;
locale = "";
monitor = "";
terminal_title_flag = "";
timeout = 0;
};
theme.name = "my-theme";
theme.style = ''
@define-color background ${nix_background};
@define-color foreground ${nix_text};
@define-color selected-text ${nix_accent};
@define-color base ${nix_background};
@define-color border ${nix_accent};
@define-color text ${nix_text};
* {
all: unset;
}
* {
font-family: monospace;
font-size: 18px;
color: @text;
}
scrollbar {
opacity: 0;
}
.normal-icons {
-gtk-icon-size: 16px;
}
.large-icons {
-gtk-icon-size: 32px;
}
.box-wrapper {
background: alpha(@base, 0.95);
padding: 20px;
border: 2px solid @border;
}
.preview-box {
}
.box {
}
.search-container {
background: @base;
padding: 10px;
}
.input placeholder {
opacity: 0.5;
}
.input {
}
.input:focus,
.input:active {
box-shadow: none;
outline: none;
}
.content-container {
}
.placeholder {
}
.scroll {
}
.list {
}
child,
child > * {
}
child:hover .item-box {
}
child:selected .item-box {
}
child:selected .item-box * {
color: @selected-text;
}
child:selected {
background: alpha(@text, 0.07);
}
.item-box {
padding-left: 14px;
}
.item-text-box {
all: unset;
padding: 14px 0;
}
.item-text {
}
.item-subtext {
font-size: 0px;
min-height: 0px;
margin: 0px;
padding: 0px;
}
.item-image {
margin-right: 14px;
-gtk-icon-transform: scale(0.9);
}
.current {
font-style: italic;
}
.keybind-hints {
background: @background;
padding: 10px;
margin-top: 10px;
}
.preview {
}
'';
};
programs.rofi = { programs.rofi = {
enable = true; enable = true;
font = "${nix_font} 14"; font = "${nix_font} 14";
@ -806,7 +662,7 @@ in
"$terminal" = "alacritty"; "$terminal" = "alacritty";
"$fileManager" = "dolphin"; "$fileManager" = "dolphin";
"$menu" = "walker"; "$menu" = "rofi -show drun";
"$browser" = "brave"; "$browser" = "brave";
################# #################
@ -885,8 +741,8 @@ in
group = { group = {
"col.border_active" = "rgb(4385be)"; "col.border_active" = "rgb(4385be)";
"col.border_inactive" = "rgb(403e3c)"; "col.border_inactive" = "rgb(403e3c)";
"col.border_locked_active" = -1; #"col.border_locked_active" = -1;
"col.border_locked_inactive" = -1; #"col.border_locked_inactive" = -1;
groupbar = { groupbar = {
font_size = 12; font_size = 12;
@ -934,11 +790,11 @@ in
}; };
layerrule = [ layerrule = [
"blur, notifications" #"blur, notifications"
"ignorezero, notifications" #"ignorezero, notifications"
# turn off anim for walker # turn off anim for walker
"noanim, walker" #"noanim, walker"
]; # add blur to notifications ]; # add blur to notifications
@ -977,7 +833,7 @@ in
# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more # See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
dwindle = { dwindle = {
pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below #pseudo = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = true; # You probably want this preserve_split = true; # You probably want this
force_split = 2; # Always split on the right force_split = 2; # Always split on the right
}; };
@ -1057,7 +913,7 @@ in
"$mainMod, W, exec, $browser" "$mainMod, W, exec, $browser"
"$mainMod, space, exec, $menu" "$mainMod, space, exec, $menu"
#"$mainMod, P, pseudo," # dwindle #"$mainMod, P, pseudo," # dwindle
"$mainMod, T, togglesplit," # dwindle #"$mainMod, T, togglesplit," # dwindle
"$mainMod SHIFT, L, exec, hyprlock" "$mainMod SHIFT, L, exec, hyprlock"
"$mainMod SHIFT, F, workspaceopt, allfloat" "$mainMod SHIFT, F, workspaceopt, allfloat"
"$mainMod SHIFT, H, exec, for i in {1..10}; do dunstctl history-pop; done; sleep 5 && dunstctl close-all" # show last 10 notifications for 5 seconds "$mainMod SHIFT, H, exec, for i in {1..10}; do dunstctl history-pop; done; sleep 5 && dunstctl close-all" # show last 10 notifications for 5 seconds
@ -1145,74 +1001,74 @@ in
# See https://wiki.hypr.land/Configuring/Window-Rules/ for more # See https://wiki.hypr.land/Configuring/Window-Rules/ for more
# See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules # See https://wiki.hypr.land/Configuring/Workspace-Rules/ for workspace rules
windowrule = [ #windowrule = [
# Example windowrule # # Example windowrule
# "float,class:^(kitty)$,title:^(kitty)$" # # "float,class:^(kitty)$,title:^(kitty)$"
# Ignore maximize requests from apps. You'll probably like this. # # Ignore maximize requests from apps. You'll probably like this.
"suppressevent maximize, class:.*" # "suppressevent maximize, class:.*"
# Fix some dragging issues with XWayland # # Fix some dragging issues with XWayland
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" # "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
# make tuis accessed from waybar float in center # # make tuis accessed from waybar float in center
"tag +floating-window, title:(bluetui|impala|wiremix)" # "tag +floating-window, title:(bluetui|impala|wiremix)"
"tag +floating-window, title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)" # "tag +floating-window, title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)"
"float, class:(org.gnome.Calculator)" # "float, class:(org.gnome.Calculator)"
# send games to specific workspace # # send games to specific workspace
"workspace name:games silent, class:$games" # "workspace name:games silent, class:$games"
"noanim, class:$games" # "noanim, class:$games"
"noblur, class:$games" # "noblur, class:$games"
"noshadow, class:$games" # "noshadow, class:$games"
"noborder, class:$games" # "noborder, class:$games"
"rounding 0, class:$games" # "rounding 0, class:$games"
"fullscreen, class:$games" # "fullscreen, class:$games"
"immediate, class:$games" # "immediate, class:$games"
# pip # # pip
"tag +pip, title:(Picture.?in.?[Pp]icture)" # "tag +pip, title:(Picture.?in.?[Pp]icture)"
"tag -default-opacity, tag:pip" # "tag -default-opacity, tag:pip"
"float, tag:pip" # "float, tag:pip"
"pin, tag:pip" # "pin, tag:pip"
"size 600 338, tag:pip" # "size 600 338, tag:pip"
"keepaspectratio, tag:pip" # "keepaspectratio, tag:pip"
"bordersize 0, tag:pip" # "bordersize 0, tag:pip"
"opacity 1 1, tag:pip" # "opacity 1 1, tag:pip"
"move (monitor_w-window_w-40) (monitor_h*0.04), tag:pip" # "move (monitor_w-window_w-40) (monitor_h*0.04), tag:pip"
# steam # # steam
"float, class:^(steam)$" # "float, class:^(steam)$"
"center, class:^(steam)$, title:^(Steam)$" # "center, class:^(steam)$, title:^(Steam)$"
"tag -default-opacity, class:^(steam.*)$" # "tag -default-opacity, class:^(steam.*)$"
"opacity 1 1, class:^(steam.*)$" # "opacity 1 1, class:^(steam.*)$"
"size 1100 700, class:^(steam)$, title:^(Steam)$" # "size 1100 700, class:^(steam)$, title:^(Steam)$"
"size 460 800, class:^(steam)$, title:^(Friends List)$" # "size 460 800, class:^(steam)$, title:^(Friends List)$"
"idleinhibit fullscreen, class:^(steam)$" # "idleinhibit fullscreen, class:^(steam)$"
# bitwarden # # bitwarden
"noscreenshare, class:^(Bitwarden)$" # "noscreenshare, class:^(Bitwarden)$"
"tag +floating-window, class:^(Bitwarden)$" # "tag +floating-window, class:^(Bitwarden)$"
# Bitwarden Chrome Extension # # Bitwarden Chrome Extension
"noscreenshare, class:^(brave-nngceckbapebfimnlniiiahkandclblb-Default)$" # "noscreenshare, class:^(brave-nngceckbapebfimnlniiiahkandclblb-Default)$"
"tag +floating-window, class:^(brave-nngceckbapebfimnlniiiahkandclblb-Default)$" # "tag +floating-window, class:^(brave-nngceckbapebfimnlniiiahkandclblb-Default)$"
# floating tag # # floating tag
"float, tag:floating-window" # "float, tag:floating-window"
"center, tag:floating-window" # "center, tag:floating-window"
"size 875 600, tag:floating-window" # "size 875 600, tag:floating-window"
# hyprbar # # hyprbar
"plugin:hyprbars:nobar, tag:^(?!floating-window$).*$" # "plugin:hyprbars:nobar, tag:^(?!floating-window$).*$"
]; #];
"$games" = #"$games" =
"^(steam_app_.*|lutris_game_class|minigalaxy|playnite_game_class|gamescope|chiaki|moonlight|com\.moonlight_stream\.Moonlight|.*[Ww]ine.*)$"; # "^(steam_app_.*|lutris_game_class|minigalaxy|playnite_game_class|gamescope|chiaki|moonlight|com\.moonlight_stream\.Moonlight|.*[Ww]ine.*)$";
workspace = [ #workspace = [
"name:1,monitor:DP-2" # "name:1,monitor:DP-2"
"name:games,monitor:DP-2" # "name:games,monitor:DP-2"
"name:4,monitor:HDMI-A-1" # "name:4,monitor:HDMI-A-1"
]; #];
}; };
}; };

47
hosts/desktop/hardware.nix
View File

@ -1,58 +1,35 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ { config, lib, pkgs, modulesPath, ... }:
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = [ imports =
(modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
"nvidia-uvm"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/bd28421d-7ec4-4b23-964d-c07a6f351e1f"; { device = "/dev/disk/by-uuid/c4d42c06-25fa-45cb-9341-76bb895140fb";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-e3a81f8e-3ae9-494b-a329-a6f860b10e34".device = boot.initrd.luks.devices."luks-4b9e90fd-5bb4-4647-89b1-0d42d5f05a1e".device = "/dev/disk/by-uuid/4b9e90fd-5bb4-4647-89b1-0d42d5f05a1e";
"/dev/disk/by-uuid/e3a81f8e-3ae9-494b-a329-a6f860b10e34";
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/D47C-5FCE"; { device = "/dev/disk/by-uuid/81A0-0593";
fsType = "vfat"; fsType = "vfat";
options = [ options = [ "fmask=0077" "dmask=0077" ];
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ swapDevices =
{ device = "/dev/disk/by-uuid/be22d9db-283a-4dd9-93d5-1006e392724b"; } [ { device = "/dev/disk/by-uuid/e0f10fbd-4f23-4f71-87bf-04a672ae3170"; }
]; ];
fileSystems."/run/media/admin/08cabc7a-9a6e-4c21-8a07-6663af77b705" = {
device = "/dev/disk/by-uuid/08cabc7a-9a6e-4c21-8a07-6663af77b705";
fsType = "ext4";
};
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction

23
hosts/desktop/settings.nix
View File

@ -19,8 +19,7 @@
}; };
boot = { boot = {
initrd.luks.devices."luks-cbf20b12-90f7-4fbb-95d3-1320eece4d89".device = initrd.luks.devices."luks-d5e2e9e2-9ffb-4e4c-9728-61209ac4dc2c".device = "/dev/disk/by-uuid/d5e2e9e2-9ffb-4e4c-9728-61209ac4dc2c";
"/dev/disk/by-uuid/cbf20b12-90f7-4fbb-95d3-1320eece4d89";
kernelParams = [ kernelParams = [
"nvidia_drm.modeset=1" "nvidia_drm.modeset=1"
"nvidia_drm.fbdev=1" "nvidia_drm.fbdev=1"
@ -31,16 +30,16 @@
networking = { networking = {
hostName = "nixos-desktop"; hostName = "nixos-desktop";
interfaces.enp42s0 = { # interfaces.enp42s0 = {
wakeOnLan.enable = true; # wakeOnLan.enable = true;
ipv4.addresses = [ # ipv4.addresses = [
{ # {
address = "192.168.30.40"; # address = "192.168.30.40";
prefixLength = 24; # prefixLength = 24;
} # }
]; # ];
}; # };
defaultGateway = "192.168.30.1"; # defaultGateway = "192.168.30.1";
nameservers = [ nameservers = [
"192.168.0.1" "192.168.0.1"
"1.1.1.1" "1.1.1.1"