Compare commits

...

14 Commits

Author SHA1 Message Date
MichaelFisher1997
282af82651 Updated 2025-07-01 18:08:58 +01:00
MichaelFisher1997
fe0da003b9 Updated 2025-07-01 18:03:06 +01:00
MichaelFisher1997
5e06d3a148 issues 2025-06-29 00:11:18 +01:00
MichaelFisher1997
94b8e38312 issues 2025-06-28 23:50:41 +01:00
MichaelFisher1997
a411f2a073 zen fix 2025-05-26 15:58:46 +01:00
MichaelFisher1997
ef57636c6c portal 2025-05-24 23:17:23 +01:00
MichaelFisher1997
37cb553a87 portal 2025-05-24 22:21:10 +01:00
MichaelFisher1997
a4e1487158 removed home folder 2025-05-11 20:19:28 +01:00
MichaelFisher1997
0d72587a3f started looking at home manager 2025-05-11 19:58:17 +01:00
MichaelFisher1997
f8f6a134d1 moved home manager to module 2025-05-11 19:48:17 +01:00
MichaelFisher1997
ab30a93005 moved home manager to module 2025-05-11 00:35:27 +01:00
MichaelFisher1997
08fd509efb moved home manager to module 2025-05-11 00:26:20 +01:00
MichaelFisher1997
a8806808f1 started looking at home manager 2025-05-11 00:02:21 +01:00
MichaelFisher1997
27faa64382 started looking at home manager 2025-05-10 22:44:45 +01:00
11 changed files with 199 additions and 255 deletions

68
flake.lock generated
View File

@@ -1,12 +1,33 @@
{ {
"nodes": { "nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"zen-browser",
"nixpkgs"
]
},
"locked": {
"lastModified": 1743604125,
"narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1751274312,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -16,9 +37,48 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"zen-browser": "zen-browser"
}
},
"zen-browser": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1751383329,
"narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351",
"type": "github"
},
"original": {
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"type": "github"
} }
} }
}, },

View File

@@ -1,16 +1,28 @@
{ {
description = "NixOS configuration for hypr-nix"; description = "NixOS configuration for hypr-nix with zen-browser";
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";
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs = { self, nixpkgs, zen-browser, ... }: {
nixosConfigurations.hypr-nix = nixpkgs.lib.nixosSystem { nixosConfigurations.hypr-nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/hypr-nix/configuration.nix ./hosts/hypr-nix/configuration.nix
]; ];
specialArgs = {
zen-browser = zen-browser;
};
}; };
}; };
} }

View File

@@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./packages.nix ./packages.nix
./mnt.nix ./mnt.nix
@@ -100,13 +101,9 @@
}; };
}; };
# XDG Portals Configuration for Wayland # Disable GNOME desktop services that might conflict
xdg.portal = { services.gnome.gnome-keyring.enable = lib.mkForce false;
enable = true; services.gnome.gnome-online-accounts.enable = lib.mkForce false;
extraPortals = [
pkgs.xdg-desktop-portal-hyprland
];
};
# Configure console keymap # Configure console keymap
console.keyMap = "uk"; console.keyMap = "uk";
@@ -141,26 +138,17 @@
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 = [
# List packages installed in system profile. To search, run: "electron-33.4.11"
# $ 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
@@ -170,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;
@@ -198,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

@@ -17,7 +17,7 @@
# Override the Docker service to disable autostart # Override the Docker service to disable autostart
systemd.services.docker = { systemd.services.docker = {
enable = false; enable = true;
wants = [ "docker.socket" ]; wants = [ "docker.socket" ];
after = [ "docker.socket" ]; after = [ "docker.socket" ];
serviceConfig = { serviceConfig = {

View File

@@ -3,6 +3,13 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.rocmPackages.rpp pkgs.rocmPackages.rpp
]; ];
hardware.opengl = {
enable = 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,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, zen-browser, ... }:
let let
unstable = import unstable = import
(builtins.fetchTarball "channel:nixos-unstable") (builtins.fetchTarball "channel:nixos-unstable")
@@ -6,212 +6,108 @@ let
in in
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Text Editors #flakes
vim zen-browser.packages."${system}".twilight
sublime # Core Languages & Runtimes (that need to be global)
lunarvim
vscode
# Development Tools
openjdk openjdk
clang-tools
gcc
cmake
glew
glfw
libGL
sdl3
vulkan-loader
vulkan-tools
vulkan-headers
wayland-protocols
golangci-lint
golangci-lint-langserver
python3
php
php83Packages.composer
exercism
betterdiscord-installer
go
bun
air
tailwindcss
google-cloud-sdk-gce
kubo
hashcat
# Version Control # Nix & Nix tools
git nixpkgs-fmt
git-lfs nixpkgs-review
nix-prefetch-git nurl
# Terminals # Core CLI & Networking Tools
kitty
alacritty
# Shell Utilities
fish
zsh
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
# Window Managers # Network & VPN
i3
eww
vesktop
hyprsunset
# Web Browsers
brave
google-chrome
firefox
tor-browser
# Communication
discord
webcord
slack
#telegram-desktop
# Media
vlc
simplescreenrecorder
obs-studio
davinci-resolve-studio
audacity
haruna
# Gaming
mangohud
protonup
protontricks
lutris
bottles
wine
wine64
# 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 and Virtualization # Containers & Virtualization
docker docker
docker-compose docker-compose
kubectl kubectl
terraform
minikube minikube
terraform
helm
awscli2
sqlite
postgresql
virt-manager
# Security # 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
sunshine
# Miscellaneous # Misc System
fastfetch calc
betterdiscord-installer
ghostty
guacamole-client
rpi-imager rpi-imager
light light
#games # Games & GPU/driver helpers (if system-wide needed)
flightgear mangohud
minetest
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
]; ];
} }