This commit is contained in:
MichaelFisher1997 2025-07-01 18:03:06 +01:00
parent 5e06d3a148
commit fe0da003b9
10 changed files with 117 additions and 250 deletions

18
flake.lock generated
View File

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750877742, "lastModified": 1751274312,
"narHash": "sha256-OrCy70x59VaBHxPZnm6A1wvQSdJvTz4i8Ngx40UeApI=", "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f25c1bd2a6b33a4b1aa7aff56a94e0daab3773f0", "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1751271578,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751127508, "lastModified": 1751383329,
"narHash": "sha256-fU2FQKNxO5gkADRFMS2S54M/LKsTewMpGRm+KJRLdFo=", "narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "5962b5db7babbb1607dcd2d1d6db9ab540cc108d", "rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
zen-browser = { zen-browser = {
url = "github:0xc000022070/zen-browser-flake"; url = "github:0xc000022070/zen-browser-flake";

View File

@ -101,23 +101,9 @@
}; };
}; };
# XDG Portals Configuration for Wayland
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-hyprland
];
config.common.default = ["hyprland"];
};
# Disable GNOME desktop services that might conflict # Disable GNOME desktop services that might conflict
services.gnome.gnome-keyring.enable = false; services.gnome.gnome-keyring.enable = lib.mkForce false;
services.gnome.gnome-online-accounts.enable = false; services.gnome.gnome-online-accounts.enable = lib.mkForce false;
#xdg.portal = {
# enable = true;
# hyprland.enable = true;
# extraPortals = [ "gtk" ]; # Optional, for GTK apps support
#};
# Configure console keymap # Configure console keymap
console.keyMap = "uk"; console.keyMap = "uk";
@ -152,30 +138,18 @@
description = "micqdf"; description = "micqdf";
extraGroups = [ "networkmanager" "wheel" "docker" ]; extraGroups = [ "networkmanager" "wheel" "docker" ];
}; };
# environment.systemPackages = [
# pkgs.home-manager
# ];
# Install programs config # Install programs config
programs.java.enable = true; programs.java.enable = true;
programs.sway.enable = true; programs.sway.enable = true;
programs.fish.enable = true;
users.defaultUserShell = pkgs.fish;
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-33.4.11" "electron-33.4.11"
]; ];
# List packages installed in system profile. To search, run:
# $ nix search wget
#nixpkgs.overlays = [
# (import ./godot4-overlay.nix)
#];
#hardware.opengl.driSupport = true; # This is already enabled by default #hardware.opengl.driSupport = true; # This is already enabled by default
hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
@ -184,23 +158,8 @@
Enable = "Source,Sink,Media,Socket"; Enable = "Source,Sink,Media,Socket";
}; };
}; };
#cosmic
#hardware.system76.enableAll = true;
#services.desktopManager.cosmic.enable = true;
#services.displayManager.cosmic-greeter.enable = true;
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
programs.gamemode.enable = true;
programs.ssh.askPassword = lib.mkForce "/nix/store/qjl45ra2yaqn88h6s9f7b79zpja9dy8b-seahorse-43.0/libexec/seahorse/ssh-askpass"; programs.ssh.askPassword = lib.mkForce "/nix/store/qjl45ra2yaqn88h6s9f7b79zpja9dy8b-seahorse-43.0/libexec/seahorse/ssh-askpass";
# # List services that you want to enable:
# environment.sessionVariables = {
# STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/micqdf/.steam/root/compatibilitytools.d";
# hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot";
# };
#
security.polkit.enable = true; security.polkit.enable = true;
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
@ -212,12 +171,6 @@
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
# 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? system.stateVersion = "24.11"; # Did you read the comment?
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
system.autoUpgrade.allowReboot = false; system.autoUpgrade.allowReboot = false;

View File

@ -2,7 +2,16 @@
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.rocmPackages.rpp pkgs.rocmPackages.rpp
]; ];
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
mesa.drivers
];
};
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
#driSupport = true; #driSupport = true;

View File

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
@ -14,7 +15,8 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/2ccf7538-1328-4793-a455-d62e09c1f057"; {
device = "/dev/disk/by-uuid/2ccf7538-1328-4793-a455-d62e09c1f057";
fsType = "ext4"; fsType = "ext4";
}; };

View File

@ -1,13 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
# package = inputs.hyprland.packages.${pkgs.system}.hyprland; # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
xwayland.enable = true; xwayland.enable = true;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
waypaper waypaper
wl-clipboard wl-clipboard
blueman blueman
rofi-wayland rofi-wayland
@ -37,11 +37,11 @@
catppuccin-kvantum catppuccin-kvantum
nwg-drawer nwg-drawer
hyprpaper hyprpaper
]; ];
programs.thunar.enable = true; programs.thunar.enable = true;
programs.thunar.plugins = with pkgs.xfce; [ programs.thunar.plugins = with pkgs.xfce; [
thunar-archive-plugin thunar-archive-plugin
thunar-volman thunar-volman
]; ];
} }

View File

@ -1,7 +1,7 @@
#this might be redundent #this might be redundent
{config, pkgs, callPackage, ... }: { config, pkgs, callPackage, ... }:
{ {
services.xserver = { services.xserver = {
enable = true; enable = true;
desktopManager = { desktopManager = {
@ -16,7 +16,7 @@
i3lock #default i3 screen locker i3lock #default i3 screen locker
i3blocks #if you are planning on using i3blocks over i3status i3blocks #if you are planning on using i3blocks over i3status
picom picom
]; ];
}; };
}; };
} }

View File

@ -1,4 +1,4 @@
{... }: { ... }:
{ {
services.rpcbind.enable = true; # needed for NFS services.rpcbind.enable = true; # needed for NFS

View File

@ -8,206 +8,109 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#flakes #flakes
zen-browser.packages."${system}".twilight zen-browser.packages."${system}".twilight
# Text Editors # Core Languages & Runtimes (that need to be global)
sublime
vscode
# Development Tools
openjdk openjdk
clang-tools
gcc # Nix & Nix tools
cmake nixpkgs-fmt
glew nixpkgs-review
glfw nurl
libGL
sdl3 # Core CLI & Networking Tools
vulkan-loader
vulkan-tools
vulkan-headers
wayland-protocols
python3
php
php83Packages.composer
exercism
betterdiscord-installer
bun
air
tailwindcss
google-cloud-sdk-gce
kubo
hashcat
# Version Control
git
git-lfs
nix-prefetch-git
# Terminals
kitty
alacritty
# Shell Utilities
home-manager
curl curl
wget wget
tree tree
fd fd
fzf
bat bat
thefuck
tmux
zellij
lolcat
lsd lsd
tldr tldr
# File Management # File systems, Mounts, Partitions
ranger
_7zz
unrar
zip
unzip
gzip
gvfs
btrfs-progs btrfs-progs
nfs-utils nfs-utils
ntfs3g ntfs3g
gvfs
# System Utilities
htop
vault
btop
amdgpu_top
parted parted
gparted gparted
xorg.xprop gptfdisk
xorg.xkill
calc
maim
xclip
xdotool
networkmanager_dmenu
virt-manager
networkmanagerapplet
polybarFull
picom
arandr
nitrogen
pywal
ldmtool ldmtool
smartmontools smartmontools
gptfdisk
# Network & VPN
# Window Managers
i3
eww
vesktop
hyprsunset
# Web Browsers
brave
google-chrome
firefox
tor-browser
# Communication
discord
webcord
slack
#telegram-desktop
# Media
vlc
simplescreenrecorder
davinci-resolve-studio
audacity
haruna
# Gaming
mangohud
protonup
protontricks
lutris
bottles
wine
wine64
# Fonts
noto-fonts
noto-fonts-color-emoji
twemoji-color-font
catppuccin-kvantum
themechanger
# Backup and Recovery
pika-backup
megasync
# Networking
ngrok
ipmitool
tailscale tailscale
remmina ipmitool
ddev
# Containers & Virtualization
# Containers and Virtualization
docker docker
docker-compose docker-compose
kubectl kubectl
terraform
minikube minikube
terraform
# Security helm
pulumi
pulumiPackages.pulumi-go
pulumiPackages.pulumi-aws-native
awscli2
sqlite
postgresql
virt-manager
# System monitoring
htop
btop
amdgpu_top
# Xorg/WM system utils
xorg.xprop
xorg.xkill
# Login/session management
networkmanagerapplet
networkmanager_dmenu
# System Security
vault
onlyoffice-bin onlyoffice-bin
rcon rcon
rconc rconc
monero-gui monero-gui
# Graphics # Spice/QEMU/VM graphics
spice spice
spice-gtk spice-gtk
spice-vdagent spice-vdagent
# Themes and Customization # KDE core system apps (for Plasma systems)
#kdePackages.qt6ct kdePackages.dolphin
catppuccin-kvantum kdePackages.filelight
# Multimedia Tools # ddev (if used for multiple users/projects)
svt-av1 ddev
rav1e
libaom # Misc System
sunshine calc
# Miscellaneous
fastfetch
betterdiscord-installer
ghostty
guacamole-client
rpi-imager rpi-imager
light light
#games # Games & GPU/driver helpers (if system-wide needed)
flightgear mangohud
# unstable.luanti
openttd # Google Cloud tools (system use)
endless-sky google-cloud-sdk-gce
cataclysm-dda kubo
xonotic
superTux # Backup/recovery (system-wide, headless or cron use)
superTuxKart megasync
airshipper
mindustry-wayland # Misc/other core system-wide apps
speed_dreams betterdiscord-installer # if you want it everywhere
simutrans_binaries air # if needed globally
#modrinth-app
minecraft # Themes and customization (for display manager, greeter, or global theming)
nsnake catppuccin-kvantum
themechanger
#kdePackages
kdePackages.dolphin
kdePackages.filelight
kdePackages.kate
kdePackages.falkon
]; ];
} }

View File

@ -7,11 +7,11 @@
openFirewall = true; openFirewall = true;
}; };
#security.wrappers.sunshine = { #security.wrappers.sunshine = {
# owner = "root"; # owner = "root";
# group = "root"; # group = "root";
# capabilities = "cap_sys_admin+p"; # capabilities = "cap_sys_admin+p";
# source = "${pkgs.sunshine}/bin/sunshine"; # source = "${pkgs.sunshine}/bin/sunshine";
# }; # };
} }