Compare commits
6 Commits
c3d670187c
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
0883d28d64
|
|||
|
a817a7139c
|
|||
|
0222a4f60d
|
|||
|
19cd5084a3
|
|||
|
182b89fbfa
|
|||
|
5d6a561c8a
|
1069
flake.lock
generated
1069
flake.lock
generated
File diff suppressed because it is too large
Load Diff
31
flake.nix
31
flake.nix
@@ -1,15 +1,20 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
disko = {
|
||||||
|
url = "github:nix-community/disko/latest";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
stylix = {
|
stylix = {
|
||||||
url = "github:danth/stylix/release-25.05";
|
url = "github:danth/stylix/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
@@ -24,9 +29,9 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
heart-modpack = {
|
# heart-modpack = {
|
||||||
url = "git+file:///home/guz/.projects/heart-modpack";
|
# url = "git+file:///home/guz/.projects/heart-modpack";
|
||||||
};
|
# };
|
||||||
|
|
||||||
nix-flatpak = {
|
nix-flatpak = {
|
||||||
url = "github:gmodena/nix-flatpak/?ref=latest";
|
url = "github:gmodena/nix-flatpak/?ref=latest";
|
||||||
@@ -134,6 +139,20 @@
|
|||||||
./home/guz-lite/configuration.nix
|
./home/guz-lite/configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
"rusty" = nixpkgs.lib.nixosSystem rec {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
pkgs-unstable = import nixpkgs-unstable {
|
||||||
|
inherit system;
|
||||||
|
config.allowUnfreePredicate = _: true;
|
||||||
|
};
|
||||||
|
inherit inputs self;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./modules/nixos/context.nix
|
||||||
|
./hosts/rusty/configuration.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
homeConfigurations = forAllSystems ({
|
homeConfigurations = forAllSystems ({
|
||||||
|
|||||||
@@ -151,17 +151,23 @@
|
|||||||
name = "Brave";
|
name = "Brave";
|
||||||
urls = [{template = "https://search.brave.com/search?q={searchTerms}";}];
|
urls = [{template = "https://search.brave.com/search?q={searchTerms}";}];
|
||||||
};
|
};
|
||||||
nix-packages = {
|
go = {
|
||||||
name = "Nix Packages";
|
name = "Go Packages";
|
||||||
urls = [{template = "https://search.nixos.org/packages?query={searchTerms}";}];
|
urls = [{template = "https://pkg.go.dev/search?q={searchTerms}";}];
|
||||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
icon = pkgs.fetchurl {
|
||||||
definedAliases = ["@pkg"];
|
url = "https://pkg.go.dev/static/shared/logo/go-white.svg";
|
||||||
|
hash = "sha256-oqFYZnPAxESEpY0Qcz5OPiCMTWXyI1nqOEYmsdbGqy4=";
|
||||||
|
};
|
||||||
|
definedAliases = ["@go"];
|
||||||
};
|
};
|
||||||
nix-options = {
|
mdn = {
|
||||||
name = "Nix Options";
|
name = "MDN";
|
||||||
urls = [{template = "https://search.nixos.org/options?query={searchTerms}";}];
|
urls = [{template = "https://developer.mozilla.org/en-US/search?q={searchTerms}";}];
|
||||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
icon = pkgs.fetchurl {
|
||||||
definedAliases = ["@opt"];
|
url = "https://developer.mozilla.org/static/client/mdn-m.70aac857e4a908d0.svg";
|
||||||
|
hash = "sha256-sTAKxjk5b8lUaa9057LOH0H3N54LeXkPF/mOe4gpHDI=";
|
||||||
|
};
|
||||||
|
definedAliases = ["@mdn"];
|
||||||
};
|
};
|
||||||
nix-home-manager = {
|
nix-home-manager = {
|
||||||
name = "Home Manager";
|
name = "Home Manager";
|
||||||
@@ -175,6 +181,27 @@
|
|||||||
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
definedAliases = ["@lib"];
|
definedAliases = ["@lib"];
|
||||||
};
|
};
|
||||||
|
nix-options = {
|
||||||
|
name = "Nix Options";
|
||||||
|
urls = [{template = "https://search.nixos.org/options?query={searchTerms}";}];
|
||||||
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
|
definedAliases = ["@opt"];
|
||||||
|
};
|
||||||
|
nix-packages = {
|
||||||
|
name = "Nix Packages";
|
||||||
|
urls = [{template = "https://search.nixos.org/packages?query={searchTerms}";}];
|
||||||
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
|
definedAliases = ["@pkg"];
|
||||||
|
};
|
||||||
|
nix-wiki = {
|
||||||
|
name = "Nix Wiki";
|
||||||
|
urls = [
|
||||||
|
{template = "https://wiki.nixos.org/w/index.php?search={searchTerms}";}
|
||||||
|
{template = "https://nixos.wiki/index.php?search={searchTerms}";}
|
||||||
|
];
|
||||||
|
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
|
||||||
|
definedAliases = ["@wiki"];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
settings = with builtins;
|
settings = with builtins;
|
||||||
mapAttrs (n: v:
|
mapAttrs (n: v:
|
||||||
@@ -258,6 +285,10 @@
|
|||||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/dearrow/latest.xpi";
|
install_url = "https://addons.mozilla.org/firefox/downloads/latest/dearrow/latest.xpi";
|
||||||
installation_mode = "force_installed";
|
installation_mode = "force_installed";
|
||||||
};
|
};
|
||||||
|
"extraneous@sysrqmagician.github.io" = {
|
||||||
|
install_url = "https://addons.mozilla.org/firefox/downloads/latest/extraneous/latest.xpi";
|
||||||
|
installation_mode = "force_installed";
|
||||||
|
};
|
||||||
"idcac-pub@guus.ninja" = {
|
"idcac-pub@guus.ninja" = {
|
||||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi";
|
install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi";
|
||||||
installation_mode = "force_installed";
|
installation_mode = "force_installed";
|
||||||
|
|||||||
@@ -33,10 +33,6 @@
|
|||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
kdePackages.xwaylandvideobridge
|
|
||||||
];
|
|
||||||
|
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
services.xserver.displayManager.gdm.enable = true;
|
||||||
|
|
||||||
fonts.fontDir.enable = true;
|
fonts.fontDir.enable = true;
|
||||||
|
|||||||
@@ -136,6 +136,7 @@
|
|||||||
|
|
||||||
# Application Launcher
|
# Application Launcher
|
||||||
programs.rofi.enable = true;
|
programs.rofi.enable = true;
|
||||||
|
programs.rofi.modes = ["drun" "emoji"];
|
||||||
|
|
||||||
# Clipboard
|
# Clipboard
|
||||||
services.cliphist.enable = true;
|
services.cliphist.enable = true;
|
||||||
|
|||||||
@@ -89,6 +89,12 @@
|
|||||||
''))
|
''))
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
# Emoji picker
|
||||||
|
"super-i" = {
|
||||||
|
launch = exec [
|
||||||
|
(lib.getExe (pkgs.rofimoji))
|
||||||
|
];
|
||||||
|
};
|
||||||
# Toggle fullscreen
|
# Toggle fullscreen
|
||||||
"super-f" = {launch = toggleFullscreen "";};
|
"super-f" = {launch = toggleFullscreen "";};
|
||||||
# Toggle floating
|
# Toggle floating
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
# Xbox Controller driver
|
# Xbox Controller driver
|
||||||
hardware.xone.enable = true;
|
hardware.xone.enable = true;
|
||||||
|
hardware.xpad-noone.enable = lib.mkForce false; # Build failure https://github.com/NixOS/nixpkgs/issues/467803
|
||||||
|
|
||||||
# OpenTabletDriver
|
# OpenTabletDriver
|
||||||
hardware.opentabletdriver.enable = true;
|
hardware.opentabletdriver.enable = true;
|
||||||
@@ -32,7 +33,6 @@
|
|||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
builtins.elem (lib.getName pkg) [
|
builtins.elem (lib.getName pkg) [
|
||||||
"davinci-resolve"
|
"davinci-resolve"
|
||||||
"megasync"
|
|
||||||
"reaper"
|
"reaper"
|
||||||
"steam"
|
"steam"
|
||||||
"steam-unwrapped"
|
"steam-unwrapped"
|
||||||
|
|||||||
@@ -28,7 +28,6 @@
|
|||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
vulkan-validation-layers
|
vulkan-validation-layers
|
||||||
amdvlk
|
|
||||||
mesa.opencl
|
mesa.opencl
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
50
hosts/rusty/configuration.nix
Normal file
50
hosts/rusty/configuration.nix
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
../../configuration.nix
|
||||||
|
inputs.disko.nixosModules.disko
|
||||||
|
];
|
||||||
|
|
||||||
|
# Network
|
||||||
|
networking = {
|
||||||
|
hostName = lib.mkForce "rusty";
|
||||||
|
#wireless.enable = lib.mkForce true;
|
||||||
|
};
|
||||||
|
|
||||||
|
disko.devices.disk.main = {
|
||||||
|
device = "/dev/sda"; # This will be overwritten by disko-install
|
||||||
|
type = "disk";
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
ESP = {
|
||||||
|
size = "500M";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot/efi";
|
||||||
|
mountOptions = ["dmask=0022" "fmask=0022" "nofail"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
root = {
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "ext4";
|
||||||
|
mountpoint = "/";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
|
||||||
|
boot.loader.grub = {
|
||||||
|
efiSupport = true;
|
||||||
|
efiInstallAsRemovable = true;
|
||||||
|
device = "nodev";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -62,8 +62,9 @@ in {
|
|||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
SHELL = lib.mkIf cfg.zsh.enable "${lib.getExe config.programs.zsh.package}";
|
SHELL = lib.mkIf cfg.zsh.enable "${lib.getExe config.programs.zsh.package}";
|
||||||
TERM = lib.mkIf cfg.ghostty.enable "xterm-ghostty";
|
TERM = lib.mkIf cfg.ghostty.enable "xterm-256color";
|
||||||
TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.ghostty.package}";
|
# Used to be ghostty, but it is borked
|
||||||
|
TERMINAL = lib.mkIf cfg.ghostty.enable "${lib.getExe config.programs.wezterm.package}";
|
||||||
EXPLORER = lib.mkIf cfg.yazi.enable "${lib.getExe config.programs.yazi.package}";
|
EXPLORER = lib.mkIf cfg.yazi.enable "${lib.getExe config.programs.yazi.package}";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -107,6 +108,8 @@ in {
|
|||||||
package = config._devkit.packages.ghostty;
|
package = config._devkit.packages.ghostty;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
programs.wezterm.enable = true;
|
||||||
|
|
||||||
## Git
|
## Git
|
||||||
programs.git = lib.mkIf cfg.git.enable {
|
programs.git = lib.mkIf cfg.git.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -9,8 +9,12 @@
|
|||||||
# YAML is a superset of JSON, so any JSON is valid YAML.
|
# YAML is a superset of JSON, so any JSON is valid YAML.
|
||||||
colors = import ../colors.nix;
|
colors = import ../colors.nix;
|
||||||
cfg = pkgs.writeText "config.yml" (builtins.toJSON ({
|
cfg = pkgs.writeText "config.yml" (builtins.toJSON ({
|
||||||
git.paging.colorArg = "always";
|
git.pagers = [
|
||||||
git.paging.pager = "${lib.getExe pkgs.delta} --dark --paging=never";
|
{
|
||||||
|
colorArg = "always";
|
||||||
|
pager = "${lib.getExe pkgs.delta} --dark --paging=never";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
gui.theme = {
|
gui.theme = {
|
||||||
activeBorderColor = [colors.base07 "bold"];
|
activeBorderColor = [colors.base07 "bold"];
|
||||||
|
|||||||
@@ -79,4 +79,4 @@ in
|
|||||||
cp ${desktopEntry}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
|
cp ${desktopEntry}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
// {inherit (zellij) meta;})
|
// {inherit (zellij) meta version;})
|
||||||
|
|||||||
Reference in New Issue
Block a user