youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-25 02:03:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: youwen5:05d971b394fb1f1890db59a154389243b7876564
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos
..
compare: youwen5:e06447440a42a260b3ce541d7ea218da8e7e2877
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos

No commits in common. "05d971b394fb1f1890db59a154389243b7876564" and "e06447440a42a260b3ce541d7ea218da8e7e2877" have entirely different histories.
05d971b394 ... e06447440a

6 changed files with 109 additions and 245 deletions
Show stats Expand all files Collapse all files

179
flake.lock
View file

@ -91,27 +91,6 @@
"type": "github" "type": "github"
} }
}, },
"crane_2": {
"inputs": {
"nixpkgs": [
"manga-tui",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724006180,
"narHash": "sha256-PVxPj0Ga2fMYMtcT9ARCthF+4U71YkOT7ZjgD/vf1Aw=",
"owner": "ipetkov",
"repo": "crane",
"rev": "7ce92819802bc583b7e82ebc08013a530f22209f",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -346,24 +325,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -593,27 +554,6 @@
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
} }
}, },
"manga-tui": {
"inputs": {
"crane": "crane_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1724635557,
"narHash": "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg=",
"owner": "josueBarretogit",
"repo": "manga-tui",
"rev": "e24c9686eefe78826eca2b0d480973d2ad5df348",
"type": "github"
},
"original": {
"owner": "josueBarretogit",
"repo": "manga-tui",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -636,7 +576,7 @@
}, },
"nix-darwin_2": { "nix-darwin_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1716329735, "lastModified": 1716329735,
@ -677,9 +617,9 @@
"nix-homebrew": { "nix-homebrew": {
"inputs": { "inputs": {
"brew-src": "brew-src", "brew-src": "brew-src",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nix-darwin": "nix-darwin_2", "nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719720211, "lastModified": 1719720211,
@ -697,18 +637,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723991338, "lastModified": 1687274257,
"narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"owner": "nixos", "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"repo": "nixpkgs", "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "path"
"type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -756,19 +693,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1716330097, "lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
@ -784,7 +708,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1724479785, "lastModified": 1724479785,
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
@ -800,6 +724,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1724224976, "lastModified": 1724224976,
@ -832,22 +772,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
@ -879,7 +803,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"personal-neovim", "personal-neovim",
"nixvim", "nixvim",
@ -903,7 +827,7 @@
"personal-neovim": { "personal-neovim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim" "nixvim": "nixvim"
}, },
"locked": { "locked": {
@ -957,10 +881,9 @@
"homebrew-core": "homebrew-core", "homebrew-core": "homebrew-core",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix-module": "lix-module", "lix-module": "lix-module",
"manga-tui": "manga-tui",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable-small": "nixpkgs-unstable-small", "nixpkgs-unstable-small": "nixpkgs-unstable-small",
"personal-neovim": "personal-neovim", "personal-neovim": "personal-neovim",
"spicetify": "spicetify", "spicetify": "spicetify",
@ -1011,27 +934,6 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_3": {
"inputs": {
"nixpkgs": [
"manga-tui",
"nixpkgs"
]
},
"locked": {
"lastModified": 1724206841,
"narHash": "sha256-L8dKaX4T3k+TR2fEHCfGbH4UXdspovz/pj87iai9qmc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "45e98fbd62c32e5927e952d2833fa1ba4fb35a61",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"spicetify": { "spicetify": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
@ -1144,21 +1046,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1183,8 +1070,8 @@
}, },
"vesktop-bin": { "vesktop-bin": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1724592759, "lastModified": 1724592759,
@ -1218,7 +1105,7 @@
}, },
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1724719995, "lastModified": 1724719995,

2
flake.nix
View file

@ -68,8 +68,6 @@
}; };
zen-browser.url = "github:youwen5/zen-browser-flake"; zen-browser.url = "github:youwen5/zen-browser-flake";
manga-tui.url = "github:josueBarretogit/manga-tui";
}; };
outputs = { outputs = {

3
overlays/default.nix
View file

@ -9,7 +9,8 @@
in { in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
manga-tui = inputs.manga-tui.packages.${pkgs.system}.default; manga-tui = bleedingpkgs.manga-tui;
}) })
# inputs.zen-browser.overlays.default
]; ];
} }

133
users/youwen/linux/hyprland/common.nix
View file

@ -37,90 +37,85 @@
"XCURSOR_THEME,Bibata-Modern-Ice" "XCURSOR_THEME,Bibata-Modern-Ice"
"XCURSOR_SIZE,26" "XCURSOR_SIZE,26"
]; ];
bind = bind = [
[ # External reserved keys: SUPER + Z and SUPER + X for zen-browser.
# External reserved keys: SUPER + Z and SUPER + X for zen-browser.
# Application Keybinds # Application Keybinds
"$mod, T, exec, kitty" "$mod, F, exec, zen-bin || librewolf"
"$mod, E, exec, dolphin" "$mod, T, exec, kitty"
"$mod, R, exec, pavucontrol" "$mod, E, exec, dolphin"
"$mod, M, exec, thunderbird" "$mod, R, exec, pavucontrol"
"$mod, B, exec, waypaper" "$mod, M, exec, thunderbird"
"$mod, B, exec, waypaper"
# Window actions # Window actions
"$mod, Q, killactive" "$mod, Q, killactive"
"$mod, W, togglefloating" "$mod, W, togglefloating"
"$mod, V, togglesplit" "$mod, V, togglesplit"
"$mod, Return, fullscreen" "$mod, Return, fullscreen"
# Move around # Move around
"$mod, $Left, movefocus, l" "$mod, $Left, movefocus, l"
"$mod, $Right, movefocus, r" "$mod, $Right, movefocus, r"
"$mod, $Up, movefocus, u" "$mod, $Up, movefocus, u"
"$mod, $Down, movefocus, d" "$mod, $Down, movefocus, d"
"$mod, 1, workspace, 1" "$mod, 1, workspace, 1"
"$mod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mod, 3, workspace, 3" "$mod, 3, workspace, 3"
"$mod, 4, workspace, 4" "$mod, 4, workspace, 4"
"$mod, 5, workspace, 5" "$mod, 5, workspace, 5"
"$mod, 6, workspace, 6" "$mod, 6, workspace, 6"
"$mod, 7, workspace, 7" "$mod, 7, workspace, 7"
"$mod, 8, workspace, 8" "$mod, 8, workspace, 8"
"$mod, 9, workspace, 9" "$mod, 9, workspace, 9"
"$mod, 0, workspace, 10" "$mod, 0, workspace, 10"
# Move active window to a workspace with mainMod + SHIFT + [0-9] # Move active window to a workspace with mainMod + SHIFT + [0-9]
"$mod+Shift, 1, movetoworkspace, 1" "$mod+Shift, 1, movetoworkspace, 1"
"$mod+Shift, 2, movetoworkspace, 2" "$mod+Shift, 2, movetoworkspace, 2"
"$mod+Shift, 3, movetoworkspace, 3" "$mod+Shift, 3, movetoworkspace, 3"
"$mod+Shift, 4, movetoworkspace, 4" "$mod+Shift, 4, movetoworkspace, 4"
"$mod+Shift, 5, movetoworkspace, 5" "$mod+Shift, 5, movetoworkspace, 5"
"$mod+Shift, 6, movetoworkspace, 6" "$mod+Shift, 6, movetoworkspace, 6"
"$mod+Shift, 7, movetoworkspace, 7" "$mod+Shift, 7, movetoworkspace, 7"
"$mod+Shift, 8, movetoworkspace, 8" "$mod+Shift, 8, movetoworkspace, 8"
"$mod+Shift, 9, movetoworkspace, 9" "$mod+Shift, 9, movetoworkspace, 9"
"$mod+Shift, 0, movetoworkspace, 10" "$mod+Shift, 0, movetoworkspace, 10"
# move to the first empty workspace instantly # move to the first empty workspace instantly
"$mod+Ctrl, $Down, workspace, empty" "$mod+Ctrl, $Down, workspace, empty"
"$mod+Ctrl, $Up, movetoworkspace, empty" "$mod+Ctrl, $Up, movetoworkspace, empty"
# Special workspace # Special workspace
"$mod, S, togglespecialworkspace" "$mod, S, togglespecialworkspace"
"$mod+Alt, S, movetoworkspacesilent, special" "$mod+Alt, S, movetoworkspacesilent, special"
# Move windows around # Move windows around
"$mod+Shift, $Left, movewindow, l" "$mod+Shift, $Left, movewindow, l"
"$mod+Shift, $Right, movewindow, r" "$mod+Shift, $Right, movewindow, r"
"$mod+Shift, $Up, movewindow, u" "$mod+Shift, $Up, movewindow, u"
"$mod+Shift, $Down, movewindow, d" "$mod+Shift, $Down, movewindow, d"
"$mod+Ctrl+Shift, $Right, movetoworkspace, r+1" "$mod+Ctrl+Shift, $Right, movetoworkspace, r+1"
"$mod+Ctrl+Shift, $Left, movetoworkspace, r-1" "$mod+Ctrl+Shift, $Left, movetoworkspace, r-1"
"$mod+Ctrl, $Right, workspace, r+1" "$mod+Ctrl, $Right, workspace, r+1"
"$mod+Ctrl, $Left, workspace, r-1" "$mod+Ctrl, $Left, workspace, r-1"
# Utilities # Utilities
"$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi application launcher "$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi application launcher
"$mod, G, exec, pkill -x rofi || rofi -show window" # Run rofi window switcher "$mod, G, exec, pkill -x rofi || rofi -show window" # Run rofi window switcher
''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot ''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot
"$mod, Backspace, exec, wlogout" # show logout menu "$mod, Backspace, exec, wlogout" # show logout menu
"$mod, I, exec, hyprlock" "$mod, I, exec, hyprlock"
# System control # System control
",XF86AudioMute, exec, pamixer -t" ",XF86AudioMute, exec, pamixer -t"
] ];
++ (
if pkgs.system != "aarch64-linux"
then ["$mod, F, exec, zen-bin"]
else ["$mod, F, exec, librewolf"]
);
bindm = [ bindm = [
"$mod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
"$mod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"

2
users/youwen/linux/packages/common-packages.nix
View file

@ -22,7 +22,7 @@ with pkgs; [
usbutils # lsusb usbutils # lsusb
# desktop utils # desktop utils
# bitwarden-cli bitwarden-cli
# desktop apps # desktop apps
dolphin dolphin

35
users/youwen/linux/packages/x86_64/default.nix
View file

@ -4,33 +4,16 @@
... ...
}: let }: let
createCommon = import ../common-packages.nix; createCommon = import ../common-packages.nix;
zen-browser = inputs.zen-browser.packages.${pkgs.system}.specific;
in { in {
home.packages = home.packages =
(createCommon pkgs) (createCommon pkgs)
++ (with pkgs; ++ (with pkgs; [
[ bitwarden-desktop
bitwarden-desktop modrinth-app
modrinth-app lutris
lutris wine
wine sbctl
sbctl r2modman
r2modman inputs.zen-browser.packages.${pkgs.system}.specific
] ]);
++ [zen-browser]);
xdg.mimeApps = {
enable = true;
defaultApplications = {
"text/html" = ["zen.desktop"];
"x-scheme-handler/http" = ["dev.zen.Zen.desktop"];
"x-scheme-handler/https" = ["dev.zen.Zen.desktop"];
"x-scheme-handler/about" = ["dev.zen.Zen.desktop"];
"x-scheme-handler/unknown" = ["dev.zen.Zen.desktop"];
};
};
home.sessionVariables = {
DEFAULT_BROWSER = "${zen-browser}/bin/zen-bin";
};
} }