diff --git a/home/programs/games.nix b/home/programs/games.nix index b9d63e5..ff63075 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -15,6 +15,8 @@ in { inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu pkgs.gale pkgs.adwsteamgtk + pkgs.oversteer + pkgs.sidequest # ( # pkgs.appimageTools.wrapType1 rec { diff --git a/home/programs/other.nix b/home/programs/other.nix index 4c0b742..ded8233 100644 --- a/home/programs/other.nix +++ b/home/programs/other.nix @@ -7,5 +7,9 @@ home.packages = lib.mkIf osConfig.niksos.desktop.apps [ pkgs.spotify pkgs.signal-desktop + pkgs.bambu-studio + pkgs.gimp + pkgs.inkscape + pkgs.thunderbird ]; } diff --git a/home/wayland/default.nix b/home/wayland/default.nix index e74aded..8734c89 100644 --- a/home/wayland/default.nix +++ b/home/wayland/default.nix @@ -16,6 +16,7 @@ in { home.packages = mkIf cfg [ pkgs.wl-clipboard + pkgs.wf-recorder ]; home.sessionVariables = mkIf cfg { diff --git a/hosts/default.nix b/hosts/default.nix index 79d99d1..da47fd1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -20,6 +20,7 @@ in { "laptop" "lapserv" "minimal" + "desktop" ]; in { # Systems diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix new file mode 100644 index 0000000..5430af8 --- /dev/null +++ b/hosts/desktop/default.nix @@ -0,0 +1,38 @@ +{ + imports = [ + ./hardware-configuration.nix + ]; + + niksos = { + hardware = { + bluetooth = true; + printer = true; + }; + + neovim = true; + desktop = { + games = true; + enable = true; + hyprland = false; #TODO: flip both, just trying if it works. + kde = true; + }; + }; + home-manager.users.jsw.wayland.windowManager.hyprland.settings = { + monitor = [ + "DP-3,2560x1440@165,0x0,1,vrr,1" + "HDMI-A-1,1920x1080,2560x540,1" + ]; + workspace = [ + "workspace = 1, monitor:DP-3" + "workspace = 2, monitor:DP-3" + "workspace = 3, monitor:DP-3" + "workspace = 4, monitor:HDMI-A-1" + "workspace = 5, monitor:HDMI-A-1" + "workspace = 6, monitor:DP-3" + "workspace = 7, monitor:DP-3" + "workspace = 8, monitor:DP-3" + "workspace = 9, monitor:DP-3" + "workspace = 0, monitor:HDMI-A-1" + ]; + }; +} diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix new file mode 100644 index 0000000..797b845 --- /dev/null +++ b/hosts/desktop/hardware-configuration.nix @@ -0,0 +1,9 @@ +# To be generated... +{ + nixpkgs.hostPlatform = "x86_64-linux"; + + fileSystems."/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; +} diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index a4f0d08..f1b3255 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -5,28 +5,13 @@ ./wluma.nix ]; - services.printing = { - enable = true; - startWhenNeeded = true; - }; - hardware.printers = { - ensureDefaultPrinter = "Broeder"; - ensurePrinters = [ - { - deviceUri = "ipp://192.168.1.33/ipp"; - location = "home"; - name = "Broeder"; - model = "everywhere"; - } - ]; - }; - # programs.evolution.enable = true; # FIXME: move to appropiate place. niksos = { hardware = { joycond = false; #NOTE: enable when game night lol fingerprint = true; bluetooth = true; + printer = true; portable = { enable = true; diff --git a/system/hardware/default.nix b/system/hardware/default.nix index 720648d..39efc2d 100644 --- a/system/hardware/default.nix +++ b/system/hardware/default.nix @@ -10,11 +10,13 @@ in { ./graphics.nix ./joycond.nix ./power.nix + ./printer.nix ]; options.niksos.hardware = { bluetooth = mkEO "bluetooth related stuff."; fingerprint = mkEO "fingerprint support."; + printer = mkEO "hh1 printer support."; graphics = { enable = mkEO "core graphics"; diff --git a/system/hardware/printer.nix b/system/hardware/printer.nix new file mode 100644 index 0000000..382ed1e --- /dev/null +++ b/system/hardware/printer.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + ... +}: { + config = lib.mkIf config.niksos.hardware.printer { + services.printing = { + enable = true; + startWhenNeeded = true; + }; + hardware.printers = { + ensureDefaultPrinter = "Broeder"; + ensurePrinters = [ + { + deviceUri = "ipp://192.168.1.33/ipp"; + location = "home"; + name = "Broeder"; + model = "everywhere"; + } + ]; + }; + }; +}