diff --git a/flake.lock b/flake.lock index 93c8e2a..fd170dc 100644 --- a/flake.lock +++ b/flake.lock @@ -294,6 +294,22 @@ "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": { "inputs": { "flake-compat": "flake-compat_2", @@ -410,6 +426,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nix-darwin": "nix-darwin", + "nix-flatpak": "nix-flatpak", "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index f474609..a88e557 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,8 @@ inputs.nixpkgs.follows = "unstable"; inputs.systems.follows = "systems"; }; + # Flatpak + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager home-manager = { url = "github:nix-community/home-manager/release-24.05"; @@ -44,6 +46,7 @@ , nix-darwin , hyprland , nixos-cosmic + , nix-flatpak }: let user = { @@ -87,6 +90,7 @@ hlCommonSettings systems nixos-cosmic + nix-flatpak ; specialArgs = { inputs = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4f651c0..706b3ab 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -83,9 +83,15 @@ in libusb1 # Web 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 hardware.opengl = { driSupport = true; diff --git a/hosts/hl-bigbox1.hardware-configuration.nix b/hosts/hl-bigbox1.hardware-configuration.nix index 46b23ba..2da1a8b 100644 --- a/hosts/hl-bigbox1.hardware-configuration.nix +++ b/hosts/hl-bigbox1.hardware-configuration.nix @@ -5,7 +5,8 @@ { 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" ]; @@ -14,25 +15,20 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49"; + { + device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BBF9-1744"; + { + device = "/dev/disk/by-uuid/BBF9-1744"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; 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..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index c0666c0..61182d9 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -4,16 +4,15 @@ imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg = { user.enable = true; + server.admin.enable = true; + server.exporters.enable = true; nixos = { common.ssh-server.enable = true; common.containers.openMetricsPort = true; - desktop.enable = false; server.services = { ai.enable = true; jellyfin.enable = true; }; - server.admin.enable = true; - server.exporters.enable = true; }; }; users.users.ari.extraGroups = [ "input" ]; @@ -26,15 +25,15 @@ boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; 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 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.enable = true; #hardware.opengl.enable = true; @@ -46,30 +45,10 @@ nvidiaSettings = true; 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; [ - steam-tui - steam-run - steamPackages.steamcmd + # steam-tui + # steam-run + # steamPackages.steamcmd ollama jellyfin jellyfin-web diff --git a/modules/lib.nix b/modules/lib.nix index aca0433..baf241d 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -4,6 +4,7 @@ , systems , hlCommonSettings , nixos-cosmic +, nix-flatpak , specialArgs }: let @@ -43,6 +44,7 @@ let } nixos-cosmic.nixosModules.default home-manager.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak ]; }); }; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index c2cc956..1539e39 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -6,6 +6,16 @@ in config = lib.mkIf cfg.enable { # Flatpak 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 programs.kdeconnect.enable = true; environment.systemPackages = with pkgs; [