mirror of
https://github.com/MichaelFisher1997/nixos.git
synced 2025-07-01 17:43:11 +00:00
Compare commits
No commits in common. "a411f2a07387dfcd2686b3a2015b44aee1a3f8c1" and "a4e1487158ddbc81a71428d13adb1041f501fdcd" have entirely different histories.
a411f2a073
...
a4e1487158
31
flake.lock
generated
31
flake.lock
generated
@ -23,11 +23,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1747862697,
|
||||
"narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
|
||||
"lastModified": 1746810718,
|
||||
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
|
||||
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -37,26 +37,9 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1748026106,
|
||||
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
@ -64,15 +47,15 @@
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748090150,
|
||||
"narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=",
|
||||
"lastModified": 1746976679,
|
||||
"narHash": "sha256-zY1wU9gp4B8I+5MrJha8Te4/0VQTzUwbQN+9XztOhLg=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d",
|
||||
"rev": "9c9a9814a733509c4b46014cf60066eed0fdd72f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -3,11 +3,10 @@
|
||||
|
||||
inputs = {
|
||||
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";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
# Include the results of the hardware scan.
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./packages.nix
|
||||
./mnt.nix
|
||||
@ -18,7 +17,7 @@
|
||||
./sunshine.nix
|
||||
#./i3.nix
|
||||
];
|
||||
|
||||
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.grub.enable = true;
|
||||
@ -39,10 +38,10 @@
|
||||
services.zfs.autoScrub.enable = true;
|
||||
services.zfs.trim.enable = true;
|
||||
|
||||
# boot.supportedFilesystems = [ "zfs" ];
|
||||
# boot.zfs.forceImportRoot = false;
|
||||
# networking.hostId = "a44f5fde";
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
# boot.supportedFilesystems = [ "zfs" ];
|
||||
# boot.zfs.forceImportRoot = false;
|
||||
# networking.hostId = "a44f5fde";
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
@ -75,14 +74,14 @@
|
||||
enable = true;
|
||||
xkb.layout = "gb";
|
||||
xkb.variant = "";
|
||||
videoDrivers = [ "amdgpu" ];
|
||||
videoDrivers = ["amdgpu"];
|
||||
|
||||
# Enable GDM as the display manager
|
||||
displayManager.gdm.enable = true;
|
||||
|
||||
# Desktop Managers Configuration
|
||||
desktopManager = {
|
||||
gnome.enable = true; # GNOME
|
||||
gnome.enable = true; # GNOME
|
||||
};
|
||||
|
||||
# Window Managers Configuration
|
||||
@ -108,11 +107,6 @@
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
};
|
||||
#xdg.portal = {
|
||||
# enable = true;
|
||||
# hyprland.enable = true;
|
||||
# extraPortals = [ "gtk" ]; # Optional, for GTK apps support
|
||||
#};
|
||||
|
||||
# Configure console keymap
|
||||
console.keyMap = "uk";
|
||||
@ -145,11 +139,11 @@
|
||||
users.users.micqdf = {
|
||||
isNormalUser = true;
|
||||
description = "micqdf";
|
||||
extraGroups = [ "networkmanager" "wheel" "docker" ];
|
||||
extraGroups = [ "networkmanager" "wheel" "docker"];
|
||||
};
|
||||
# environment.systemPackages = [
|
||||
# pkgs.home-manager
|
||||
# ];
|
||||
# environment.systemPackages = [
|
||||
# pkgs.home-manager
|
||||
# ];
|
||||
|
||||
# Install programs config
|
||||
programs.java.enable = true;
|
||||
@ -161,15 +155,12 @@
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-33.4.11"
|
||||
];
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
#nixpkgs.overlays = [
|
||||
# (import ./godot4-overlay.nix)
|
||||
#];
|
||||
#nixpkgs.overlays = [
|
||||
# (import ./godot4-overlay.nix)
|
||||
#];
|
||||
|
||||
#hardware.opengl.driSupport = true; # This is already enabled by default
|
||||
hardware.bluetooth.enable = true; # enables support for Bluetooth
|
||||
@ -188,14 +179,14 @@
|
||||
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";
|
||||
# };
|
||||
#
|
||||
# # 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;
|
||||
# Enable the OpenSSH daemon.
|
||||
services.openssh.enable = true;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
# Override the Docker service to disable autostart
|
||||
systemd.services.docker = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
wants = [ "docker.socket" ];
|
||||
after = [ "docker.socket" ];
|
||||
serviceConfig = {
|
||||
|
||||
@ -9,7 +9,9 @@ in
|
||||
#flakes
|
||||
zen-browser.packages."${system}".twilight
|
||||
# Text Editors
|
||||
vim
|
||||
sublime
|
||||
lunarvim
|
||||
vscode
|
||||
|
||||
# Development Tools
|
||||
@ -25,11 +27,14 @@ in
|
||||
vulkan-tools
|
||||
vulkan-headers
|
||||
wayland-protocols
|
||||
golangci-lint
|
||||
golangci-lint-langserver
|
||||
python3
|
||||
php
|
||||
php83Packages.composer
|
||||
exercism
|
||||
betterdiscord-installer
|
||||
go
|
||||
bun
|
||||
air
|
||||
tailwindcss
|
||||
@ -48,6 +53,8 @@ in
|
||||
|
||||
# Shell Utilities
|
||||
home-manager
|
||||
fish
|
||||
zsh
|
||||
curl
|
||||
wget
|
||||
tree
|
||||
@ -119,6 +126,7 @@ in
|
||||
# Media
|
||||
vlc
|
||||
simplescreenrecorder
|
||||
obs-studio
|
||||
davinci-resolve-studio
|
||||
audacity
|
||||
haruna
|
||||
@ -133,7 +141,6 @@ in
|
||||
wine64
|
||||
|
||||
# Fonts
|
||||
noto-fonts
|
||||
noto-fonts-color-emoji
|
||||
twemoji-color-font
|
||||
catppuccin-kvantum
|
||||
@ -188,7 +195,7 @@ in
|
||||
|
||||
#games
|
||||
flightgear
|
||||
# unstable.luanti
|
||||
minetest
|
||||
openttd
|
||||
endless-sky
|
||||
cataclysm-dda
|
||||
@ -199,7 +206,7 @@ in
|
||||
mindustry-wayland
|
||||
speed_dreams
|
||||
simutrans_binaries
|
||||
#modrinth-app
|
||||
modrinth-app
|
||||
minecraft
|
||||
nsnake
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user