Added flatpak management with nix

Really trying to make bigbox not sleep
This commit is contained in:
ari committed 2024-11-23 10:33:46 -05:00
1 parent 98860419c7
commit 5358bd35f8
7 files changed
+59 -45

No files matched your search

Generated
+17
View File
@@ -294,6 +294,22 @@
"type": "github" "type": "github"
} }
}, },
"nix-flatpak": {
"locked": {
"lastModified": 1731698554,
"narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "8db1648a95446d41e97ace7caf54e172669810ff",
"type": "github"
},
"original": {
"owner": "gmodena",
"ref": "main",
"repo": "nix-flatpak",
"type": "github"
}
},
"nixos-cosmic": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@@ -410,6 +426,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
+4
View File
@@ -17,6 +17,8 @@
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
inputs.systems.follows = "systems"; inputs.systems.follows = "systems";
}; };
# Flatpak
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main";
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
@@ -44,6 +46,7 @@
, nix-darwin , nix-darwin
, hyprland , hyprland
, nixos-cosmic , nixos-cosmic
, nix-flatpak
}: }:
let let
user = { user = {
@@ -87,6 +90,7 @@
hlCommonSettings hlCommonSettings
systems systems
nixos-cosmic nixos-cosmic
nix-flatpak
; ;
specialArgs = { specialArgs = {
inputs = { inputs = {
+8 -2
View File
@@ -83,9 +83,15 @@ in
libusb1 libusb1
# Web # Web
chromium chromium
]) ++ (with unstable; [
dbeaver-bin
]); ]);
services.flatpak.packages = [
"com.slack.Slack"
"com.spotify.Client"
"com.cassidyjames.butler"
"dev.zed.Zed"
"io.dbeaver.DBeaverCommunity"
"io.github.zen_browser.zen"
];
# # Opengl # # Opengl
hardware.opengl = { hardware.opengl = {
driSupport = true; driSupport = true;
+6 -10
View File
@@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
@@ -14,25 +15,20 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49"; {
device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/BBF9-1744"; {
device = "/dev/disk/by-uuid/BBF9-1744";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = [ ]; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }
+12 -33
View File
@@ -4,16 +4,15 @@
imports = [ ./hl-bigbox1.hardware-configuration.nix ]; imports = [ ./hl-bigbox1.hardware-configuration.nix ];
skyg = { skyg = {
user.enable = true; user.enable = true;
server.admin.enable = true;
server.exporters.enable = true;
nixos = { nixos = {
common.ssh-server.enable = true; common.ssh-server.enable = true;
common.containers.openMetricsPort = true; common.containers.openMetricsPort = true;
desktop.enable = false;
server.services = { server.services = {
ai.enable = true; ai.enable = true;
jellyfin.enable = true; jellyfin.enable = true;
}; };
server.admin.enable = true;
server.exporters.enable = true;
}; };
}; };
users.users.ari.extraGroups = [ "input" ]; users.users.ari.extraGroups = [ "input" ];
@@ -26,15 +25,15 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true; boot.tmp.useTmpfs = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
# Wake on Lan
networking.interfaces.enp4s0.wakeOnLan.enable = true;
networking.interfaces.lo.wakeOnLan.enable = true;
networking.interfaces.tailscale0.wakeOnLan.enable = true;
# Suspend
services.autosuspend.enable = false;
services.xserver.displayManager.gdm.autoSuspend = false;
# Nvidia Settings # Nvidia Settings
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.enable = false;
#services.openssh.settings.X11Forwarding = true;
#services.xserver.displayManager.gdm.autoLogin.delay = 0;
#services.displayManager.autoLogin = {
# enable = true;
# user = config.skyg.user.name;
#};
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
hardware.graphics.enable = true; hardware.graphics.enable = true;
#hardware.opengl.enable = true; #hardware.opengl.enable = true;
@@ -46,30 +45,10 @@
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
# Steam Settings
users.users.steam = {
shell = pkgs.zsh;
isNormalUser = true;
description = "Steam User";
extraGroups = [ "wheel" "input" ];
};
# Sunshine Service
services.sunshine = {
enable = true;
autoStart = true;
capSysAdmin = true;
openFirewall = true;
};
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true;
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
steam-tui # steam-tui
steam-run # steam-run
steamPackages.steamcmd # steamPackages.steamcmd
ollama ollama
jellyfin jellyfin
jellyfin-web jellyfin-web
+2
View File
@@ -4,6 +4,7 @@
, systems , systems
, hlCommonSettings , hlCommonSettings
, nixos-cosmic , nixos-cosmic
, nix-flatpak
, specialArgs , specialArgs
}: }:
let let
@@ -43,6 +44,7 @@ let
} }
nixos-cosmic.nixosModules.default nixos-cosmic.nixosModules.default
home-manager.nixosModules.default home-manager.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
]; ];
}); });
}; };
+10
View File
@@ -6,6 +6,16 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Flatpak # Flatpak
services.flatpak.enable = true; services.flatpak.enable = true;
services.flatpak.remotes = [
{
name = "flathub-beta";
location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
}
{
name = "flathub";
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
}
];
# Mobile Connect # Mobile Connect
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [