From 6cb21efae5466f9ab86086ef38e079e08657b749 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 13 Apr 2025 12:04:12 -0400 Subject: [PATCH] updated razer working on server --- flake.lock | 63 ++++++++++++------- flake.nix | 1 + hosts/eddie/configuration.nix | 13 ++-- hosts/emenel-services/configuration.nix | 14 ++++- hosts/emenel-services/disko-config.nix | 2 +- .../hardware-configuration.nix | 2 - hosts/emenel-services/networking.nix | 5 +- modules/home/desktop.nix | 2 + modules/home/langs.nix | 2 - 9 files changed, 69 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 41a8442..7e5dc1a 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "owner": "nix-community", + "repo": "disko", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "elemental-wine-source": { "flake": false, "locked": { @@ -70,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1744479669, - "narHash": "sha256-t2KLWeuwczpXX0ZjsO6l07NFHpoHsfEHjLBn6Ifp/Rc=", + "lastModified": 1744535716, + "narHash": "sha256-GUYB6p5v1RlI9gpaqh2E0a0dxikhta5UqZpE4/IwuGQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff930b5e806d659480b70f6ac3b2ba7efb346682", + "rev": "147f6b98f17b0d66866eb8923a6ae6fe9c23b65e", "type": "github" }, "original": { @@ -357,11 +377,11 @@ ] }, "locked": { - "lastModified": 1744400600, - "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", + "lastModified": 1744498625, + "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", + "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", "type": "github" }, "original": { @@ -995,11 +1015,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -1043,11 +1063,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -1130,6 +1150,7 @@ "root": { "inputs": { "affinity-nix": "affinity-nix", + "disko": "disko", "emacs-lsp-booster": "emacs-lsp-booster", "emacs-overlay": "emacs-overlay", "emenel-templates": "emenel-templates", @@ -1222,11 +1243,11 @@ ] }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": { @@ -1451,11 +1472,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1742480467, - "narHash": "sha256-y4iRZ3bUpN8prKIbVQw++4yM4LtXLED7/D/9HJjGjJI=", + "lastModified": 1744552454, + "narHash": "sha256-w4Y0re7P/MREahMzVVxBaGnIE/Jjtwd2RU0aunKkC7U=", "owner": "wez", "repo": "wezterm", - "rev": "a87358516004a652ad840bc1661bdf65ffc89b43", + "rev": "d2df5b755f9ed3f017472bbe66ff1eb762c36e18", "type": "github" }, "original": { @@ -1529,11 +1550,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1744451963, - "narHash": "sha256-WCl0rIeud8mC8SLiO1yrxNcZXTI7S40c70nmpD9ca20=", + "lastModified": 1744526776, + "narHash": "sha256-H+RSj9U8tZ5jh5UzCjt2kBvpN0AsyELAv8ZOP42Kt74=", "owner": "sxyazi", "repo": "yazi", - "rev": "af92b92da81addab089e0f490f79f09a6f63857f", + "rev": "d2cc73c9277662f05be12e1cdd1c9659dd1d6268", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 14c5a62..6b5457f 100644 --- a/flake.nix +++ b/flake.nix @@ -208,6 +208,7 @@ modules = [ inputs.sops-nix.nixosModules.sops home-manager.nixosModules.home-manager + inputs.disko.nixosModules.disko ./hosts/emenel-services/configuration.nix diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 54dbb64..41cb76b 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -18,7 +18,7 @@ filesystems-filez filesystems-media-server sound - openrazer + # openrazer ]; nixpkgs = { @@ -153,6 +153,7 @@ win-virtio win-spice xwayland-satellite + openrazer-daemon ]; # Bootloader. @@ -178,7 +179,7 @@ extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver xpadneo - # openrazer + openrazer ]; extraModprobeConfig = '' options bluetooth disable_ertm=Y @@ -220,10 +221,10 @@ }; i2c.enable = true; uinput.enable = true; - # openrazer = { - # enable = true; - # users = [ "emenel" ]; - # }; + openrazer = { + enable = true; + users = [ "emenel" ]; + }; graphics = { enable = true; enable32Bit = true; diff --git a/hosts/emenel-services/configuration.nix b/hosts/emenel-services/configuration.nix index 742c486..ed85d20 100644 --- a/hosts/emenel-services/configuration.nix +++ b/hosts/emenel-services/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }:{ +{ config, lib, pkgs, inputs, ... }:{ imports = [ ./hardware-configuration.nix @@ -41,7 +41,17 @@ ]; }; - + services = { + forgejo = { + enable = true; + lfs.enable = true; + settings = { + server = { + HTTP_PORT = 12345; + }; + }; + }; + }; system.stateVersion = "25.05"; # Did you read the comment? diff --git a/hosts/emenel-services/disko-config.nix b/hosts/emenel-services/disko-config.nix index d439fcc..29c6446 100644 --- a/hosts/emenel-services/disko-config.nix +++ b/hosts/emenel-services/disko-config.nix @@ -1,4 +1,4 @@ -{ +{ ... }:{ disko.devices = { disk = { main = { diff --git a/hosts/emenel-services/hardware-configuration.nix b/hosts/emenel-services/hardware-configuration.nix index 1aaca2b..eb69f1a 100644 --- a/hosts/emenel-services/hardware-configuration.nix +++ b/hosts/emenel-services/hardware-configuration.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - # boot.loader.grub.device = "/dev/sda"; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; boot.initrd.kernelModules = [ "nvme" ]; - # fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; } diff --git a/hosts/emenel-services/networking.nix b/hosts/emenel-services/networking.nix index 02e9b46..3379cad 100644 --- a/hosts/emenel-services/networking.nix +++ b/hosts/emenel-services/networking.nix @@ -2,7 +2,10 @@ # This file was populated at runtime with the networking # details gathered from the active system. networking = { - nameservers = [ "8.8.8.8" ]; + firewall = { + enable = true; + allowedTCPPorts = [ 22 80 12345 53 443 ]; + }; defaultGateway = "172.31.1.1"; defaultGateway6 = { address = "fe80::1"; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index fd1158f..536afa4 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -62,6 +62,8 @@ stirling-pdf ripdrag + polychromatic + swayidle emojify smile diff --git a/modules/home/langs.nix b/modules/home/langs.nix index 12a5d72..0ba8b04 100644 --- a/modules/home/langs.nix +++ b/modules/home/langs.nix @@ -21,8 +21,6 @@ cljfmt libxml2 nixfmt-rfc-style - php - rustup shfmt html-tidy openal