diff --git a/flake.lock b/flake.lock index f8e1771..724d030 100644 --- a/flake.lock +++ b/flake.lock @@ -37,8 +37,8 @@ ] }, "locked": { - "lastModified": 1771735274, - "narHash": "sha256-hOUyqyL+VdVwN9mzFD0FLOS0FcMIwWiUbYEP3ovy1w0=", + "lastModified": 1771918353, + "narHash": "sha256-8kaw7l3rtY8YLxiV9Mrl8rTwW4IfBdz74q3Nib6ZSH4=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -146,6 +146,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1769996383, "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", @@ -160,7 +178,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nt", @@ -223,6 +241,28 @@ "type": "github" } }, + "mango": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "scenefx": "scenefx" + }, + "locked": { + "lastModified": 1771732288, + "narHash": "sha256-N1H7LMWXYNn7zN9ghp4vHlBs4O/Rw/+ZEoPUpm9ozw4=", + "owner": "DreamMaoMao", + "repo": "mango", + "rev": "6b2d694b234cae9876eb81e27991439eb51860f1", + "type": "github" + }, + "original": { + "owner": "DreamMaoMao", + "repo": "mango", + "type": "github" + } + }, "microvm": { "inputs": { "nixpkgs": [ @@ -285,7 +325,7 @@ }, "nix-unit": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nt", @@ -325,7 +365,7 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ] @@ -361,6 +401,21 @@ } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1769909678, "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", @@ -434,6 +489,7 @@ "dobutterfliescry-net": "dobutterfliescry-net", "grub2-themes": "grub2-themes", "home-manager": "home-manager", + "mango": "mango", "nix-flatpak": "nix-flatpak", "nixcats": "nixcats", "nixcord": "nixcord", @@ -465,6 +521,27 @@ "type": "github" } }, + "scenefx": { + "inputs": { + "nixpkgs": [ + "mango", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750785057, + "narHash": "sha256-tGX6j4W91rcb+glXJo43sjPI9zQvPotonknG1BdihR4=", + "owner": "wlrfx", + "repo": "scenefx", + "rev": "3a6cfb12e4ba97b43326357d14f7b3e40897adfc", + "type": "github" + }, + "original": { + "owner": "wlrfx", + "repo": "scenefx", + "type": "github" + } + }, "sddm-silent": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9aebbd1..df36837 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,11 @@ url = "github:uiriansan/SilentSDDM"; inputs.nixpkgs.follows = "nixpkgs"; }; + + mango = { + url = "github:DreamMaoMao/mango"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; nixConfig = { diff --git a/groups/cryde/default.nix b/groups/cryde/default.nix index 7e65055..0d27476 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, config, ... @@ -29,25 +30,30 @@ wayland.enable = ! config.services.xserver.enable; # experimental # theme = "corners"; }; + + # defaultSession = "mango"; # DEBUG defaultSession = - "hyprland" - + ( - if config.programs.hyprland.withUWSM == true - then "-uwsm" - else null - ); + if config.programs.hyprland.withUWSM == true + then "hyprland-uwsm" + else "hyprland"; }; tumbler.enable = true; # Thunar image thumbnail support gvfs.enable = true; # Thunar mount, trash, and other functionality }; + home-manager.sharedModules = [ + inputs.mango.hmModules.mango + ]; + programs = { zsh.enable = true; fish.enable = true; nix-ld.enable = true; + mango.enable = true; + neovim = { enable = true; defaultEditor = true; @@ -105,6 +111,8 @@ sessionVariables = { # Hint Electrons apps to use Wayland NIXOS_OZONE_WL = "1"; + + QT_QPA_PLATFORMTHEME = "xdgdesktopportal"; }; # systemPackages = with pkgs; [ # sddm-theme-corners diff --git a/groups/cryos/programs.nix b/groups/cryos/programs.nix index c915036..0e95333 100644 --- a/groups/cryos/programs.nix +++ b/groups/cryos/programs.nix @@ -82,6 +82,7 @@ ripgrep viddy # modern `watch` command timg # terminal image (sixel) viewer + wormhole-rs # Pretty necessary git @@ -92,6 +93,7 @@ vim powertop imagemagick + usbutils # "Standard" Unix Commands file diff --git a/groups/server/default.nix b/groups/server/default.nix index 1f97310..18f1256 100644 --- a/groups/server/default.nix +++ b/groups/server/default.nix @@ -66,6 +66,7 @@ # primary user cry = { isNormalUser = true; + createHome = true; home = "/home/cry"; extraGroups = ["wheel"]; openssh.authorizedKeys.keys = lib.mkDefault [ diff --git a/homes/cry/default.nix b/homes/cry/default.nix index 3c33619..4ff9b0a 100644 --- a/homes/cry/default.nix +++ b/homes/cry/default.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - ... -}: { +{...}: { nixpkgs = { config.allowUnfree = false; }; @@ -17,8 +10,8 @@ ]; home = { - username = "ae"; - homeDirectory = "/home/ae"; + username = "cry"; + homeDirectory = "/home/cry"; }; # Nicely reload system units when changing configs diff --git a/homes/me/default.nix b/homes/me/default.nix index 5cc251d..5073d80 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -17,7 +17,10 @@ ../modules/apps/thunderbird.nix ../modules/apps/nixcord.nix - ../modules/wm/hypr/hyprlock.nix + # ../modules/wm + ../modules/wm/mangowc.nix + # ../modules/wm/hypr/hyprland.nix + # ../modules/wm/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/mako.nix ]; @@ -32,6 +35,8 @@ homeDirectory = "/home/me"; shellAliases = { + rebuild = "sudo nixos-rebuild switch --flake /home/me/flake --show-trace"; + trybuild = "sudo nixos-rebuild test --flake /home/me/flake --show-trace"; brip = "batgrep"; # bat + ripgrep man = "batman"; # bat + man }; diff --git a/homes/modules/wm/default.nix b/homes/modules/wm/default.nix new file mode 100644 index 0000000..8c0cc95 --- /dev/null +++ b/homes/modules/wm/default.nix @@ -0,0 +1,39 @@ +{ + pkgs, + lib, + ... +}: let + inherit + (lib) + mkEnableOption + mkOption + types + ; +in { + imports = [ + ./hypr/hyprland.nix + ./mangowc.nix + ]; + + options.cryos = { + wm = { + default = mkOption { + type = types.enum ["mangowc" "hyprland"]; + default = "mangowc"; + example = "hyprland"; + description = "Window manager to boot by default."; + }; + hyprland.enabled = mkEnableOption "hyprland"; + mangowc.enabled = mkEnableOption "mangowc"; + }; + }; + + config = { + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + # xdg-desktop-portal-gtk + ]; + }; + }; +} diff --git a/homes/modules/wm/hypr/hyprland.nix b/homes/modules/wm/hypr/hyprland.nix index 38ed5af..77b3b44 100755 --- a/homes/modules/wm/hypr/hyprland.nix +++ b/homes/modules/wm/hypr/hyprland.nix @@ -1,42 +1,29 @@ # NOTE: hyprland must be enabled in BOTH your host config (for running hyprland) -# and your home-manager config (for managing hyprland's config files) +# NOTE: and your home-manager config (for managing hyprland's config files) { pkgs, inputs, - config, - lib, ... }: { - options.hyprland = { - enable = lib.mkEnableOption "Hyprland"; - }; - - config = lib.mkIf config.hyprland.enable { + config = { wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; + # package = pkgs.hyprland; + package = null; + portalPackage = null; xwayland.enable = true; - systemd = { - enable = true; - # enable autostart of applications - # REF: `man 8 systemd-xdg-autostart-generator` - enableXdgAutostart = true; - }; + # systemd = { + # enable = true; + # # enable autostart of applications + # # REF: `man 8 systemd-xdg-autostart-generator` + # enableXdgAutostart = true; + # }; - plugins = with inputs; [ - split-monitor-workspaces.packages.${pkgs.system}.split - ]; + # plugins = with inputs; [ + # split-monitor-workspaces.packages.${pkgs.system}.split + # ]; }; - - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - }; - - # TODO: finish this }; } diff --git a/homes/modules/wm/mangowc.nix b/homes/modules/wm/mangowc.nix new file mode 100644 index 0000000..74248a2 --- /dev/null +++ b/homes/modules/wm/mangowc.nix @@ -0,0 +1,107 @@ +{...}: { + home.shellAliases = { + logoff = "mmsg -q"; + }; + + wayland.windowManager.mango = { + enable = true; + + systemd = { + enable = true; + + # enable autostart of applications + # REF: `man 8 systemd-xdg-autostart-generator` + xdgAutostart = true; + }; + + settings = '' + # REF: config.conf + exec-once = awww-daemon + exec-once = mako + + bind=SUPER,Return,spawn,foot + bind=SUPER,R,spawn,fuzzel + + bind=SUPER+SHIFT,R,reload_config + bind=SUPER,Q,killclient + + # Brightness + bind=NONE,XF86MonBrightnessUp,spawn,brightnessctl -e4 -n2 set 5%+ + bind=NONE,XF86MonBrightnessDown,spawn,brightnessctl -e4 -n2 set 5%- + bind=SUPER+SHIFT,-,spawn brightnessctl -e4 -n2 set 5%+ + bind=SUPER+SHIFT,+,spawn brightnessctl -e4 -n2 set 5%- + + # Window Options + bind=SUPER,F,togglefullscreen + bind=SUPER+SHIFT,F,togglefakefullscreen + + # Window Movement + bind=SUPER,Tab,focusstack,next + bind=SUPER,h,focusdir,left + bind=SUPER,l,focusdir,right + bind=SUPER,k,focusdir,up + bind=SUPER,j,focusdir,down + bind=SUPER,Left,focusdir,left + bind=SUPER,Right,focusdir,right + bind=SUPER,Up,focusdir,up + bind=SUPER,Down,focusdir,down + + keymode=resize + bind=NONE,Left,resizewin,-10.0 + bind=NONE,Right,resizewin,+10.0 + bind=NONE,Escape,setkeymode,default + + # Keyboard + repeat_rate=25 + repeat_delay=300 + numlockon=0 + xkb_rules_layout=us + + # Laptop Specific Things + # disable_trackpad=0 + # mouse_natural_scrolling=1 + + + bind=SUPER,1,view,1,0 + bind=SUPER,2,view,2,0 + bind=SUPER,3,view,3,0 + bind=SUPER,4,view,4,0 + bind=SUPER,5,view,5,0 + bind=SUPER,6,view,6,0 + bind=SUPER,7,view,7,0 + bind=SUPER,8,view,8,0 + bind=SUPER,9,view,9,0 + bind=SUPER+SHIFT,1,tag,1,0 + bind=SUPER+SHIFT,2,tag,2,0 + bind=SUPER+SHIFT,3,tag,3,0 + bind=SUPER+SHIFT,4,tag,4,0 + bind=SUPER+SHIFT,5,tag,5,0 + bind=SUPER+SHIFT,6,tag,6,0 + bind=SUPER+SHIFT,7,tag,7,0 + bind=SUPER+SHIFT,8,tag,8,0 + bind=SUPER+SHIFT,9,tag,9,0 + + bind=SUPER+SHIFT,h,focusmon,left + bind=SUPER+SHIFT,l,focusmon,right + bind=SUPER+SHIFT,k,focusmon,up + bind=SUPER+SHIFT,j,focusmon,down + + # bind=SUPER,Left,tagmon,left + # bind=SUPER,Right,tagmon,right + # bind=SUPER,Up,tagmon,up + # bind=SUPER,Down,tagmon,down + + bind=SUPER,g,toggleglobal + bind=SUPER,o,toggleoverlay + bind=SUPER,a,togglefloating + bind=SUPER,z,toggle_scratchpad + + ''; + autostart_sh = '' + # REF: autostart.sh + + # XDG_CURRENT_DESKTOP=Hyprland + # dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + ''; + }; +} diff --git a/hosts/butterfly/default.nix b/hosts/butterfly/default.nix index feeff1f..9ac9111 100755 --- a/hosts/butterfly/default.nix +++ b/hosts/butterfly/default.nix @@ -69,10 +69,20 @@ mode = "boot"; }; - users.users.cry = { - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsUZY45rgezi+8iROdcR5vPeacJ2fbMjlDijfUrH9hRX2FzCsg/4e3aFKhi2seZMmyTfbstxmDrrH8paUS5TibFgLFBGNngaF3CTjg85i5pm25Hr4IVo31oziBnTWaG6j3buYKtz5e1qSPzXywinJR+5+FCUJU7Fxa+EWTZcOX4wYgArSj4q73rZmvk5N0X44Mudt4nvpD2chvxygsdTzD6ph92qCuaJ/AbfmOoC7b/xvOaOVydUfgDLpHi9VZbd3akvvKxRfW6ZklldgXEzPXKMuastN0mwcBxvIb5G1Vkj8jtSVtKPc5psZ9/NWA5l38xH4qZ6z7eib6thtEMdtcKmTZEEWDADjqTea5Gj61c1n18cr6f3Tff+0bn/cxsl4Y0esi+aDeuCXYiIYNmeKBx0ttDNIxpk4J5Fdh6Xs+AZif5lnJErtu8TPy2aC0bc9wehTjMyvilTHfyerOD1ZJXhN2XwRVDGN7t7leAJZISJlPjqTDcw3Vfvzte/5JqS+FR+hbpG4uz2ix8kUa20u5YF2oSdGl8+zsdozVsdQm10Iv9WSXBV7t4m+oyodgtfzydBpmXq7aBXudCiEKw+7TC7F+1a4YFrVrCNXKFgKUpd1MiVLl7DIbzm5U9MD2BB3Fy7BPCzr3tW6/ExOhhpBWY+HnzVGQfkNr7dRcqfipKw== ae@dobutterfliescry.net" - ]; + users.users = { + cry = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsUZY45rgezi+8iROdcR5vPeacJ2fbMjlDijfUrH9hRX2FzCsg/4e3aFKhi2seZMmyTfbstxmDrrH8paUS5TibFgLFBGNngaF3CTjg85i5pm25Hr4IVo31oziBnTWaG6j3buYKtz5e1qSPzXywinJR+5+FCUJU7Fxa+EWTZcOX4wYgArSj4q73rZmvk5N0X44Mudt4nvpD2chvxygsdTzD6ph92qCuaJ/AbfmOoC7b/xvOaOVydUfgDLpHi9VZbd3akvvKxRfW6ZklldgXEzPXKMuastN0mwcBxvIb5G1Vkj8jtSVtKPc5psZ9/NWA5l38xH4qZ6z7eib6thtEMdtcKmTZEEWDADjqTea5Gj61c1n18cr6f3Tff+0bn/cxsl4Y0esi+aDeuCXYiIYNmeKBx0ttDNIxpk4J5Fdh6Xs+AZif5lnJErtu8TPy2aC0bc9wehTjMyvilTHfyerOD1ZJXhN2XwRVDGN7t7leAJZISJlPjqTDcw3Vfvzte/5JqS+FR+hbpG4uz2ix8kUa20u5YF2oSdGl8+zsdozVsdQm10Iv9WSXBV7t4m+oyodgtfzydBpmXq7aBXudCiEKw+7TC7F+1a4YFrVrCNXKFgKUpd1MiVLl7DIbzm5U9MD2BB3Fy7BPCzr3tW6/ExOhhpBWY+HnzVGQfkNr7dRcqfipKw== ae@dobutterfliescry.net" + ]; + }; + foxora = { + isNormalUser = true; + createHome = true; + home = "/home/foxora"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDSBRYKap1p5lPocRTkguhJN72D2R2CImt5cFYx3Qa7h aurora@nixarawrui" + ]; + }; }; virtualisation.docker.enable = true; diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index 0adb056..a072583 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -19,10 +19,20 @@ }; }; - users.users.cry = { - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsUZY45rgezi+8iROdcR5vPeacJ2fbMjlDijfUrH9hRX2FzCsg/4e3aFKhi2seZMmyTfbstxmDrrH8paUS5TibFgLFBGNngaF3CTjg85i5pm25Hr4IVo31oziBnTWaG6j3buYKtz5e1qSPzXywinJR+5+FCUJU7Fxa+EWTZcOX4wYgArSj4q73rZmvk5N0X44Mudt4nvpD2chvxygsdTzD6ph92qCuaJ/AbfmOoC7b/xvOaOVydUfgDLpHi9VZbd3akvvKxRfW6ZklldgXEzPXKMuastN0mwcBxvIb5G1Vkj8jtSVtKPc5psZ9/NWA5l38xH4qZ6z7eib6thtEMdtcKmTZEEWDADjqTea5Gj61c1n18cr6f3Tff+0bn/cxsl4Y0esi+aDeuCXYiIYNmeKBx0ttDNIxpk4J5Fdh6Xs+AZif5lnJErtu8TPy2aC0bc9wehTjMyvilTHfyerOD1ZJXhN2XwRVDGN7t7leAJZISJlPjqTDcw3Vfvzte/5JqS+FR+hbpG4uz2ix8kUa20u5YF2oSdGl8+zsdozVsdQm10Iv9WSXBV7t4m+oyodgtfzydBpmXq7aBXudCiEKw+7TC7F+1a4YFrVrCNXKFgKUpd1MiVLl7DIbzm5U9MD2BB3Fy7BPCzr3tW6/ExOhhpBWY+HnzVGQfkNr7dRcqfipKw== ae@dobutterfliescry.net" - ]; + users.users = { + cry = { + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCsUZY45rgezi+8iROdcR5vPeacJ2fbMjlDijfUrH9hRX2FzCsg/4e3aFKhi2seZMmyTfbstxmDrrH8paUS5TibFgLFBGNngaF3CTjg85i5pm25Hr4IVo31oziBnTWaG6j3buYKtz5e1qSPzXywinJR+5+FCUJU7Fxa+EWTZcOX4wYgArSj4q73rZmvk5N0X44Mudt4nvpD2chvxygsdTzD6ph92qCuaJ/AbfmOoC7b/xvOaOVydUfgDLpHi9VZbd3akvvKxRfW6ZklldgXEzPXKMuastN0mwcBxvIb5G1Vkj8jtSVtKPc5psZ9/NWA5l38xH4qZ6z7eib6thtEMdtcKmTZEEWDADjqTea5Gj61c1n18cr6f3Tff+0bn/cxsl4Y0esi+aDeuCXYiIYNmeKBx0ttDNIxpk4J5Fdh6Xs+AZif5lnJErtu8TPy2aC0bc9wehTjMyvilTHfyerOD1ZJXhN2XwRVDGN7t7leAJZISJlPjqTDcw3Vfvzte/5JqS+FR+hbpG4uz2ix8kUa20u5YF2oSdGl8+zsdozVsdQm10Iv9WSXBV7t4m+oyodgtfzydBpmXq7aBXudCiEKw+7TC7F+1a4YFrVrCNXKFgKUpd1MiVLl7DIbzm5U9MD2BB3Fy7BPCzr3tW6/ExOhhpBWY+HnzVGQfkNr7dRcqfipKw== ae@dobutterfliescry.net" + ]; + }; + foxora = { + isNormalUser = true; + createHome = true; + home = "/home/foxora"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDSBRYKap1p5lPocRTkguhJN72D2R2CImt5cFYx3Qa7h aurora@nixarawrui" + ]; + }; }; virtualisation.docker.enable = true; diff --git a/hosts/modules/hyprland/default.nix b/hosts/modules/hyprland/default.nix index 530f075..3029f7c 100755 --- a/hosts/modules/hyprland/default.nix +++ b/hosts/modules/hyprland/default.nix @@ -2,7 +2,6 @@ # and your home-manager config (for managing hyprland's config files) { pkgs, - inputs, config, lib, ... @@ -14,15 +13,19 @@ config = lib.mkIf config.hyprland.enable { programs.hyprland = { enable = true; + portalPackage = pkgs.xdg-desktop-portal-hyprland; #package = inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; }; xdg.portal = { enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; + wlr.enable = true; + + # extraPortals = with pkgs; [ + # xdg-desktop-portal-hyprland + # # xdg-desktop-portal-gtk + # ]; }; # TODO: finish this (I didn't like the dotfiles I was getting inspo from and stopped) diff --git a/hosts/modules/wm/hyprland.nix b/hosts/modules/wm/hyprland.nix index c83caa1..e10eedc 100644 --- a/hosts/modules/wm/hyprland.nix +++ b/hosts/modules/wm/hyprland.nix @@ -3,11 +3,23 @@ hyprsunset ]; + xdg.portal = { + enable = true; + + wlr.enable = true; + + # extraPortals = with pkgs; [ + # xdg-desktop-portal-hyprland + # xdg-desktop-portal-gtk + # ]; + }; + programs = { hyprland = { enable = true; - withUWSM = true; # Universal Wayland Session Manager + # withUWSM = true; # Universal Wayland Session Manager xwayland.enable = true; + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; }; } diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 28e7e05..2db250b 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -25,6 +25,25 @@ # ----- SERVICES ----- services = { flatpak.enable = true; + + udev = { + enable = true; + packages = with pkgs; [ + via + ]; + + # Microdia AK820 (AJAZZ Keeb) + # REF: https://get.vial.today/manual/linux-udev.html + # KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", ATTRS{idVendor}=="0c45", ATTRS{idProduct}=="8009", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + + # (AJAZZ Keeb) + # REF: https://get.vial.today/manual/linux-udev.html + # KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", ATTRS{idVendor}=="d010", ATTRS{idProduct}=="1601", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" + extraRules = '' + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="d010", ATTRS{idProduct}=="1601", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="d010", ATTRS{idProduct}=="1601", TAG+="uaccess" + ''; + }; }; security.sudo.wheelNeedsPassword = lib.mkForce false; @@ -33,6 +52,8 @@ environment.systemPackages = with pkgs; [ # User Environment libreoffice + via # makes my keek worky :3 [DEBUG] + vial # gui for keeb DEBUG # Games prismlauncher # minecraft diff --git a/nixpkgs.nix b/nixpkgs.nix index fcd5db4..18fcf98 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -22,33 +22,11 @@ "obsidian" "gitkraken" + "via" ]; }; }; - # nixpkgs (stable branch) - # pkgs = { - # inherit system; - # source = inputs.nixpkgs; - # overlays = [ - # inputs.dobutterfliescry-net.overlays.default - # (import ./overlays args) - # ]; - # config = { - # # allowUnfree = false; - # allowBroken = false; - # allowUnfreePredicate = pkg: - # builtins.elem (lib.getName pkg) [ - # "discord" - # "steam" - # "steamcmd" - # "steam-unwrapped" - - # "obsidian" - # "gitkraken" - # ]; - # }; - # }; # nixpkgs-unstable upkgs = { inherit system; diff --git a/snow.nix b/snow.nix index 86c40f6..ec6e9d8 100644 --- a/snow.nix +++ b/snow.nix @@ -26,6 +26,7 @@ modules = with inputs; [ grub2-themes.nixosModules.default nix-flatpak.nixosModules.nix-flatpak + inputs.mango.nixosModules.mango ]; }; @@ -36,6 +37,7 @@ modules = with inputs; [ grub2-themes.nixosModules.default nix-flatpak.nixosModules.nix-flatpak + inputs.mango.nixosModules.mango ]; };