Compare commits

..

No commits in common. "76bf148b1edfd1b17dac5171b45c1ae25e3125b8" and "79d3109a35f0bf53ff7633cb3ec6fced6c6d4980" have entirely different histories.

19 changed files with 92 additions and 351 deletions

87
flake.lock generated
View file

@ -37,8 +37,8 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771918353, "lastModified": 1771726756,
"narHash": "sha256-8kaw7l3rtY8YLxiV9Mrl8rTwW4IfBdz74q3Nib6ZSH4=", "narHash": "sha256-IoIB96vTFWEWovjKIuahnSvdj4f/CtmZUH1ItikpkeY=",
"path": "/home/me/cry/mk/cerulean", "path": "/home/me/cry/mk/cerulean",
"type": "path" "type": "path"
}, },
@ -146,24 +146,6 @@
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "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": { "locked": {
"lastModified": 1769996383, "lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
@ -178,7 +160,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nt", "nt",
@ -241,28 +223,6 @@
"type": "github" "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": { "microvm": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -325,7 +285,7 @@
}, },
"nix-unit": { "nix-unit": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": [
"nt", "nt",
@ -365,7 +325,7 @@
"nixcord": { "nixcord": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -401,21 +361,6 @@
} }
}, },
"nixpkgs-lib": { "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": { "locked": {
"lastModified": 1769909678, "lastModified": 1769909678,
"narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
@ -489,7 +434,6 @@
"dobutterfliescry-net": "dobutterfliescry-net", "dobutterfliescry-net": "dobutterfliescry-net",
"grub2-themes": "grub2-themes", "grub2-themes": "grub2-themes",
"home-manager": "home-manager", "home-manager": "home-manager",
"mango": "mango",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixcats": "nixcats", "nixcats": "nixcats",
"nixcord": "nixcord", "nixcord": "nixcord",
@ -521,27 +465,6 @@
"type": "github" "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": { "sddm-silent": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -55,11 +55,6 @@
url = "github:uiriansan/SilentSDDM"; url = "github:uiriansan/SilentSDDM";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mango = {
url = "github:DreamMaoMao/mango";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
nixConfig = { nixConfig = {

View file

@ -1,5 +1,4 @@
{ {
inputs,
pkgs, pkgs,
config, config,
... ...
@ -30,30 +29,25 @@
wayland.enable = ! config.services.xserver.enable; # experimental wayland.enable = ! config.services.xserver.enable; # experimental
# theme = "corners"; # theme = "corners";
}; };
# defaultSession = "mango"; # DEBUG
defaultSession = defaultSession =
if config.programs.hyprland.withUWSM == true "hyprland"
then "hyprland-uwsm" + (
else "hyprland"; if config.programs.hyprland.withUWSM == true
then "-uwsm"
else null
);
}; };
tumbler.enable = true; # Thunar image thumbnail support tumbler.enable = true; # Thunar image thumbnail support
gvfs.enable = true; # Thunar mount, trash, and other functionality gvfs.enable = true; # Thunar mount, trash, and other functionality
}; };
home-manager.sharedModules = [
inputs.mango.hmModules.mango
];
programs = { programs = {
zsh.enable = true; zsh.enable = true;
fish.enable = true; fish.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
mango.enable = true;
neovim = { neovim = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -127,6 +121,9 @@
shell = pkgs.bash; shell = pkgs.bash;
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
nitch
starfetch
gitkraken gitkraken
]; ];
}; };

View file

@ -82,7 +82,6 @@
ripgrep ripgrep
viddy # modern `watch` command viddy # modern `watch` command
timg # terminal image (sixel) viewer timg # terminal image (sixel) viewer
wormhole-rs
# Pretty necessary # Pretty necessary
git git
@ -93,7 +92,6 @@
vim vim
powertop powertop
imagemagick imagemagick
usbutils
# "Standard" Unix Commands # "Standard" Unix Commands
file file

View file

@ -66,7 +66,6 @@
# primary user # primary user
cry = { cry = {
isNormalUser = true; isNormalUser = true;
createHome = true;
home = "/home/cry"; home = "/home/cry";
extraGroups = ["wheel"]; extraGroups = ["wheel"];
openssh.authorizedKeys.keys = lib.mkDefault [ openssh.authorizedKeys.keys = lib.mkDefault [

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
nixpkgs = { nixpkgs = {
config.allowUnfree = false; config.allowUnfree = false;
}; };
@ -10,8 +17,8 @@
]; ];
home = { home = {
username = "cry"; username = "ae";
homeDirectory = "/home/cry"; homeDirectory = "/home/ae";
}; };
# Nicely reload system units when changing configs # Nicely reload system units when changing configs

View file

@ -17,10 +17,7 @@
../modules/apps/thunderbird.nix ../modules/apps/thunderbird.nix
../modules/apps/nixcord.nix ../modules/apps/nixcord.nix
# ../modules/wm ../modules/wm/hypr/hyprlock.nix
../modules/wm/mangowc.nix
# ../modules/wm/hypr/hyprland.nix
# ../modules/wm/hypr/hyprlock.nix
../modules/kanshi.nix ../modules/kanshi.nix
../modules/mako.nix ../modules/mako.nix
]; ];
@ -35,8 +32,6 @@
homeDirectory = "/home/me"; homeDirectory = "/home/me";
shellAliases = { 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 brip = "batgrep"; # bat + ripgrep
man = "batman"; # bat + man man = "batman"; # bat + man
}; };

View file

@ -28,7 +28,6 @@
"Do butterflies cry when they're sad?" "Do butterflies cry when they're sad?"
"I hope they do" "I hope they do"
"I think Alice is lost..." "I think Alice is lost..."
"I once again retreat to the sanctuary of my virtual realm"
"Something wicked this way comes" "Something wicked this way comes"
"May your L's be many... and your bitches few" "May your L's be many... and your bitches few"

View file

@ -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
];
};
};
}

View file

@ -1,29 +1,42 @@
# NOTE: hyprland must be enabled in BOTH your host config (for running hyprland) # 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, pkgs,
inputs, inputs,
config,
lib,
... ...
}: { }: {
config = { options.hyprland = {
enable = lib.mkEnableOption "Hyprland";
};
config = lib.mkIf config.hyprland.enable {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
# package = pkgs.hyprland; package = pkgs.hyprland;
package = null;
portalPackage = null;
xwayland.enable = true; xwayland.enable = true;
# systemd = { systemd = {
# enable = true; enable = true;
# # enable autostart of applications # enable autostart of applications
# # REF: `man 8 systemd-xdg-autostart-generator` # REF: `man 8 systemd-xdg-autostart-generator`
# enableXdgAutostart = true; enableXdgAutostart = true;
# }; };
# plugins = with inputs; [ plugins = with inputs; [
# split-monitor-workspaces.packages.${pkgs.system}.split split-monitor-workspaces.packages.${pkgs.system}.split
# ]; ];
}; };
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
];
};
# TODO: finish this
}; };
} }

View file

@ -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
'';
};
}

View file

@ -69,20 +69,10 @@
mode = "boot"; mode = "boot";
}; };
users.users = { users.users.cry = {
cry = { openssh.authorizedKeys.keys = [
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"
"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; virtualisation.docker.enable = true;

View file

@ -19,20 +19,10 @@
}; };
}; };
users.users = { users.users.cry = {
cry = { openssh.authorizedKeys.keys = [
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"
"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; virtualisation.docker.enable = true;

View file

@ -2,6 +2,7 @@
# and your home-manager config (for managing hyprland's config files) # and your home-manager config (for managing hyprland's config files)
{ {
pkgs, pkgs,
inputs,
config, config,
lib, lib,
... ...
@ -13,19 +14,15 @@
config = lib.mkIf config.hyprland.enable { config = lib.mkIf config.hyprland.enable {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
#package = inputs.hyprland.packages.${pkgs.system}.hyprland; #package = inputs.hyprland.packages.${pkgs.system}.hyprland;
xwayland.enable = true; xwayland.enable = true;
}; };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; extraPortals = with pkgs; [
xdg-desktop-portal-gtk
# 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) # TODO: finish this (I didn't like the dotfiles I was getting inspo from and stopped)

View file

@ -3,23 +3,11 @@
hyprsunset hyprsunset
]; ];
xdg.portal = {
enable = true;
wlr.enable = true;
# extraPortals = with pkgs; [
# xdg-desktop-portal-hyprland
# xdg-desktop-portal-gtk
# ];
};
programs = { programs = {
hyprland = { hyprland = {
enable = true; enable = true;
# withUWSM = true; # Universal Wayland Session Manager withUWSM = true; # Universal Wayland Session Manager
xwayland.enable = true; xwayland.enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
}; };
}; };
} }

View file

@ -25,25 +25,6 @@
# ----- SERVICES ----- # ----- SERVICES -----
services = { services = {
flatpak.enable = true; 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; security.sudo.wheelNeedsPassword = lib.mkForce false;
@ -52,8 +33,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# User Environment # User Environment
libreoffice libreoffice
via # makes my keek worky :3 [DEBUG]
vial # gui for keeb DEBUG
# Games # Games
prismlauncher # minecraft prismlauncher # minecraft

11
hosts/myputer/hardware.nix Normal file → Executable file
View file

@ -12,25 +12,24 @@
(modulesPath + "/installer/scan/not-detected.nix") (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.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/b5eb6fbc-b9c7-453b-955f-e77011bce094"; device = "/dev/disk/by-uuid/ff19e1b0-cacc-4270-a94b-7922f7224ae2";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/1554-FFF9"; device = "/dev/disk/by-uuid/7046-177A";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0077" "dmask=0077"]; options = ["fmask=0077" "dmask=0077"];
}; };
swapDevices = [ swapDevices = [
{device = "/dev/disk/by-uuid/7f7e9d69-78e0-49f1-b792-6be26ed8e040";} {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 # 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 # 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`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
# networking.interfaces.enp34s0.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; # networking.interfaces.wlp38s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -22,11 +22,33 @@
"obsidian" "obsidian"
"gitkraken" "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 # nixpkgs-unstable
upkgs = { upkgs = {
inherit system; inherit system;

View file

@ -26,7 +26,6 @@
modules = with inputs; [ modules = with inputs; [
grub2-themes.nixosModules.default grub2-themes.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
inputs.mango.nixosModules.mango
]; ];
}; };
@ -37,7 +36,6 @@
modules = with inputs; [ modules = with inputs; [
grub2-themes.nixosModules.default grub2-themes.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak nix-flatpak.nixosModules.nix-flatpak
inputs.mango.nixosModules.mango
]; ];
}; };