Compare commits

...

3 Commits

Author SHA1 Message Date
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
5 changed files with 61 additions and 41 deletions

31
flake.lock generated
View File

@ -23,11 +23,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746810718, "lastModified": 1747862697,
"narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "rev": "2baa12ff69913392faf0ace833bc54bba297ea95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,9 +37,26 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
}, },
@ -47,15 +64,15 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-unstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1746976679, "lastModified": 1748090150,
"narHash": "sha256-zY1wU9gp4B8I+5MrJha8Te4/0VQTzUwbQN+9XztOhLg=", "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "9c9a9814a733509c4b46014cf60066eed0fdd72f", "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -3,10 +3,11 @@
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 = { zen-browser = {
url = "github:0xc000022070/zen-browser-flake"; url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
}; };

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
@ -38,10 +39,10 @@
services.zfs.autoScrub.enable = true; services.zfs.autoScrub.enable = true;
services.zfs.trim.enable = true; services.zfs.trim.enable = true;
# boot.supportedFilesystems = [ "zfs" ]; # boot.supportedFilesystems = [ "zfs" ];
# boot.zfs.forceImportRoot = false; # boot.zfs.forceImportRoot = false;
# networking.hostId = "a44f5fde"; # networking.hostId = "a44f5fde";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -74,14 +75,14 @@
enable = true; enable = true;
xkb.layout = "gb"; xkb.layout = "gb";
xkb.variant = ""; xkb.variant = "";
videoDrivers = ["amdgpu"]; videoDrivers = [ "amdgpu" ];
# Enable GDM as the display manager # Enable GDM as the display manager
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
# Desktop Managers Configuration # Desktop Managers Configuration
desktopManager = { desktopManager = {
gnome.enable = true; # GNOME gnome.enable = true; # GNOME
}; };
# Window Managers Configuration # Window Managers Configuration
@ -107,6 +108,11 @@
pkgs.xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-hyprland
]; ];
}; };
#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";
@ -139,11 +145,11 @@
users.users.micqdf = { users.users.micqdf = {
isNormalUser = true; isNormalUser = true;
description = "micqdf"; description = "micqdf";
extraGroups = [ "networkmanager" "wheel" "docker"]; extraGroups = [ "networkmanager" "wheel" "docker" ];
}; };
# environment.systemPackages = [ # environment.systemPackages = [
# pkgs.home-manager # pkgs.home-manager
# ]; # ];
# Install programs config # Install programs config
programs.java.enable = true; programs.java.enable = true;
@ -155,12 +161,15 @@
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [
"electron-33.4.11"
];
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
#nixpkgs.overlays = [ #nixpkgs.overlays = [
# (import ./godot4-overlay.nix) # (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
@ -179,14 +188,14 @@
programs.steam.gamescopeSession.enable = true; programs.steam.gamescopeSession.enable = true;
programs.gamemode.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: # # List services that you want to enable:
# environment.sessionVariables = { # environment.sessionVariables = {
# STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/micqdf/.steam/root/compatibilitytools.d"; # STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/micqdf/.steam/root/compatibilitytools.d";
# hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot"; # 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;

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

@ -9,9 +9,7 @@ in
#flakes #flakes
zen-browser.packages."${system}".twilight zen-browser.packages."${system}".twilight
# Text Editors # Text Editors
vim
sublime sublime
lunarvim
vscode vscode
# Development Tools # Development Tools
@ -27,14 +25,11 @@ in
vulkan-tools vulkan-tools
vulkan-headers vulkan-headers
wayland-protocols wayland-protocols
golangci-lint
golangci-lint-langserver
python3 python3
php php
php83Packages.composer php83Packages.composer
exercism exercism
betterdiscord-installer betterdiscord-installer
go
bun bun
air air
tailwindcss tailwindcss
@ -53,8 +48,6 @@ in
# Shell Utilities # Shell Utilities
home-manager home-manager
fish
zsh
curl curl
wget wget
tree tree
@ -126,7 +119,6 @@ in
# Media # Media
vlc vlc
simplescreenrecorder simplescreenrecorder
obs-studio
davinci-resolve-studio davinci-resolve-studio
audacity audacity
haruna haruna
@ -141,6 +133,7 @@ in
wine64 wine64
# Fonts # Fonts
noto-fonts
noto-fonts-color-emoji noto-fonts-color-emoji
twemoji-color-font twemoji-color-font
catppuccin-kvantum catppuccin-kvantum
@ -195,7 +188,7 @@ in
#games #games
flightgear flightgear
minetest # unstable.luanti
openttd openttd
endless-sky endless-sky
cataclysm-dda cataclysm-dda
@ -206,7 +199,7 @@ in
mindustry-wayland mindustry-wayland
speed_dreams speed_dreams
simutrans_binaries simutrans_binaries
modrinth-app #modrinth-app
minecraft minecraft
nsnake nsnake