diff --git a/flake.lock b/flake.lock index 724d030..f650af9 100644 --- a/flake.lock +++ b/flake.lock @@ -37,8 +37,8 @@ ] }, "locked": { - "lastModified": 1771918353, - "narHash": "sha256-8kaw7l3rtY8YLxiV9Mrl8rTwW4IfBdz74q3Nib6ZSH4=", + "lastModified": 1771726756, + "narHash": "sha256-IoIB96vTFWEWovjKIuahnSvdj4f/CtmZUH1ItikpkeY=", "path": "/home/me/cry/mk/cerulean", "type": "path" }, @@ -146,24 +146,6 @@ "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=", @@ -178,7 +160,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nt", @@ -241,28 +223,6 @@ "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": [ @@ -325,7 +285,7 @@ }, "nix-unit": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nt", @@ -365,7 +325,7 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ] @@ -401,21 +361,6 @@ } }, "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=", @@ -489,7 +434,6 @@ "dobutterfliescry-net": "dobutterfliescry-net", "grub2-themes": "grub2-themes", "home-manager": "home-manager", - "mango": "mango", "nix-flatpak": "nix-flatpak", "nixcats": "nixcats", "nixcord": "nixcord", @@ -521,27 +465,6 @@ "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 df36837..9aebbd1 100644 --- a/flake.nix +++ b/flake.nix @@ -55,11 +55,6 @@ 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 0229556..d550fa5 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, config, ... @@ -30,30 +29,25 @@ wayland.enable = ! config.services.xserver.enable; # experimental # theme = "corners"; }; - - # defaultSession = "mango"; # DEBUG defaultSession = - if config.programs.hyprland.withUWSM == true - then "hyprland-uwsm" - else "hyprland"; + "hyprland" + + ( + if config.programs.hyprland.withUWSM == true + then "-uwsm" + else null + ); }; 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; @@ -127,6 +121,9 @@ shell = pkgs.bash; packages = with pkgs; [ firefox + nitch + starfetch + gitkraken ]; }; diff --git a/groups/cryos/programs.nix b/groups/cryos/programs.nix index 0e95333..c915036 100644 --- a/groups/cryos/programs.nix +++ b/groups/cryos/programs.nix @@ -82,7 +82,6 @@ ripgrep viddy # modern `watch` command timg # terminal image (sixel) viewer - wormhole-rs # Pretty necessary git @@ -93,7 +92,6 @@ vim powertop imagemagick - usbutils # "Standard" Unix Commands file diff --git a/groups/server/default.nix b/groups/server/default.nix index 18f1256..1f97310 100644 --- a/groups/server/default.nix +++ b/groups/server/default.nix @@ -66,7 +66,6 @@ # 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 4ff9b0a..3c33619 100644 --- a/homes/cry/default.nix +++ b/homes/cry/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { nixpkgs = { config.allowUnfree = false; }; @@ -10,8 +17,8 @@ ]; home = { - username = "cry"; - homeDirectory = "/home/cry"; + username = "ae"; + homeDirectory = "/home/ae"; }; # Nicely reload system units when changing configs diff --git a/homes/me/default.nix b/homes/me/default.nix index 5073d80..5cc251d 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -17,10 +17,7 @@ ../modules/apps/thunderbird.nix ../modules/apps/nixcord.nix - # ../modules/wm - ../modules/wm/mangowc.nix - # ../modules/wm/hypr/hyprland.nix - # ../modules/wm/hypr/hyprlock.nix + ../modules/wm/hypr/hyprlock.nix ../modules/kanshi.nix ../modules/mako.nix ]; @@ -35,8 +32,6 @@ 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/fish.nix b/homes/modules/fish.nix index ddfbcf7..77a2324 100755 --- a/homes/modules/fish.nix +++ b/homes/modules/fish.nix @@ -28,7 +28,6 @@ "Do butterflies cry when they're sad?" "I hope they do" "I think Alice is lost..." - "I once again retreat to the sanctuary of my virtual realm" "Something wicked this way comes" "May your L's be many... and your bitches few" diff --git a/homes/modules/wm/default.nix b/homes/modules/wm/default.nix deleted file mode 100644 index 8c0cc95..0000000 --- a/homes/modules/wm/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - 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 77b3b44..38ed5af 100755 --- a/homes/modules/wm/hypr/hyprland.nix +++ b/homes/modules/wm/hypr/hyprland.nix @@ -1,29 +1,42 @@ # NOTE: hyprland must be enabled in BOTH your host config (for running hyprland) -# NOTE: and your home-manager config (for managing hyprland's config files) +# and your home-manager config (for managing hyprland's config files) { pkgs, inputs, + config, + lib, ... }: { - config = { + options.hyprland = { + enable = lib.mkEnableOption "Hyprland"; + }; + + config = lib.mkIf config.hyprland.enable { wayland.windowManager.hyprland = { enable = true; - # package = pkgs.hyprland; - package = null; - portalPackage = null; + package = pkgs.hyprland; 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 deleted file mode 100644 index 74248a2..0000000 --- a/homes/modules/wm/mangowc.nix +++ /dev/null @@ -1,107 +0,0 @@ -{...}: { - 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 9ac9111..feeff1f 100755 --- a/hosts/butterfly/default.nix +++ b/hosts/butterfly/default.nix @@ -69,20 +69,10 @@ 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" - ]; - }; - foxora = { - isNormalUser = true; - createHome = true; - home = "/home/foxora"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDSBRYKap1p5lPocRTkguhJN72D2R2CImt5cFYx3Qa7h aurora@nixarawrui" - ]; - }; + 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" + ]; }; virtualisation.docker.enable = true; diff --git a/hosts/hyrule/default.nix b/hosts/hyrule/default.nix index a072583..0adb056 100755 --- a/hosts/hyrule/default.nix +++ b/hosts/hyrule/default.nix @@ -19,20 +19,10 @@ }; }; - 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" - ]; - }; + 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" + ]; }; virtualisation.docker.enable = true; diff --git a/hosts/modules/hyprland/default.nix b/hosts/modules/hyprland/default.nix index 3029f7c..530f075 100755 --- a/hosts/modules/hyprland/default.nix +++ b/hosts/modules/hyprland/default.nix @@ -2,6 +2,7 @@ # and your home-manager config (for managing hyprland's config files) { pkgs, + inputs, config, lib, ... @@ -13,19 +14,15 @@ 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; - wlr.enable = true; - - # extraPortals = with pkgs; [ - # xdg-desktop-portal-hyprland - # # xdg-desktop-portal-gtk - # ]; + extraPortals = with pkgs; [ + 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 e10eedc..c83caa1 100644 --- a/hosts/modules/wm/hyprland.nix +++ b/hosts/modules/wm/hyprland.nix @@ -3,23 +3,11 @@ 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 2db250b..28e7e05 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -25,25 +25,6 @@ # ----- 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; @@ -52,8 +33,6 @@ 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/hosts/myputer/hardware.nix b/hosts/myputer/hardware.nix old mode 100644 new mode 100755 index f8c72c3..904a0c2 --- a/hosts/myputer/hardware.nix +++ b/hosts/myputer/hardware.nix @@ -12,25 +12,24 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/b5eb6fbc-b9c7-453b-955f-e77011bce094"; + device = "/dev/disk/by-uuid/ff19e1b0-cacc-4270-a94b-7922f7224ae2"; fsType = "ext4"; }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/1554-FFF9"; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/7046-177A"; fsType = "vfat"; options = ["fmask=0077" "dmask=0077"]; }; swapDevices = [ {device = "/dev/disk/by-uuid/7f7e9d69-78e0-49f1-b792-6be26ed8e040";} - {device = "/dev/disk/by-uuid/32ecabb6-7bb9-4861-8a2a-13a99f1338d2";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -38,9 +37,7 @@ # 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.docker0.useDHCP = lib.mkDefault true; # networking.interfaces.enp34s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; # networking.interfaces.wlp38s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/nixpkgs.nix b/nixpkgs.nix index 18fcf98..fcd5db4 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -22,11 +22,33 @@ "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 ec6e9d8..86c40f6 100644 --- a/snow.nix +++ b/snow.nix @@ -26,7 +26,6 @@ modules = with inputs; [ grub2-themes.nixosModules.default nix-flatpak.nixosModules.nix-flatpak - inputs.mango.nixosModules.mango ]; }; @@ -37,7 +36,6 @@ modules = with inputs; [ grub2-themes.nixosModules.default nix-flatpak.nixosModules.nix-flatpak - inputs.mango.nixosModules.mango ]; };