From 37cb553a873181786a3e92d4c1f28f919feb3c5d Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Sat, 24 May 2025 22:21:10 +0100 Subject: [PATCH] portal --- flake.lock | 12 ++++---- hosts/hypr-nix/configuration.nix | 49 +++++++++++++++++--------------- hosts/hypr-nix/docker.nix | 2 +- hosts/hypr-nix/packages.nix | 12 ++------ 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index feff224..945fba0 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1746976679, - "narHash": "sha256-zY1wU9gp4B8I+5MrJha8Te4/0VQTzUwbQN+9XztOhLg=", + "lastModified": 1748090150, + "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9c9a9814a733509c4b46014cf60066eed0fdd72f", + "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", "type": "github" }, "original": { diff --git a/hosts/hypr-nix/configuration.nix b/hosts/hypr-nix/configuration.nix index c1b6525..abde204 100644 --- a/hosts/hypr-nix/configuration.nix +++ b/hosts/hypr-nix/configuration.nix @@ -6,7 +6,8 @@ { imports = - [ # Include the results of the hardware scan. + [ + # Include the results of the hardware scan. ./hardware-configuration.nix ./packages.nix ./mnt.nix @@ -17,7 +18,7 @@ ./sunshine.nix #./i3.nix ]; - + # Bootloader. boot.loader.grub.enable = true; @@ -38,10 +39,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; @@ -74,14 +75,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 @@ -107,7 +108,6 @@ pkgs.xdg-desktop-portal-hyprland ]; }; - # Configure console keymap console.keyMap = "uk"; @@ -139,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; @@ -155,12 +155,15 @@ # 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 @@ -179,14 +182,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; diff --git a/hosts/hypr-nix/docker.nix b/hosts/hypr-nix/docker.nix index d64d5a2..aa90d83 100644 --- a/hosts/hypr-nix/docker.nix +++ b/hosts/hypr-nix/docker.nix @@ -17,7 +17,7 @@ # Override the Docker service to disable autostart systemd.services.docker = { - enable = false; + enable = true; wants = [ "docker.socket" ]; after = [ "docker.socket" ]; serviceConfig = { diff --git a/hosts/hypr-nix/packages.nix b/hosts/hypr-nix/packages.nix index 28cfb0c..10f60f9 100644 --- a/hosts/hypr-nix/packages.nix +++ b/hosts/hypr-nix/packages.nix @@ -9,9 +9,7 @@ in #flakes zen-browser.packages."${system}".twilight # Text Editors - vim sublime - lunarvim vscode # Development Tools @@ -27,14 +25,11 @@ in vulkan-tools vulkan-headers wayland-protocols - golangci-lint - golangci-lint-langserver python3 php php83Packages.composer exercism betterdiscord-installer - go bun air tailwindcss @@ -53,8 +48,6 @@ in # Shell Utilities home-manager - fish - zsh curl wget tree @@ -141,6 +134,7 @@ in wine64 # Fonts + noto-fonts noto-fonts-color-emoji twemoji-color-font catppuccin-kvantum @@ -195,7 +189,7 @@ in #games flightgear - minetest +# unstable.luanti openttd endless-sky cataclysm-dda @@ -206,7 +200,7 @@ in mindustry-wayland speed_dreams simutrans_binaries - modrinth-app + #modrinth-app minecraft nsnake