Compare commits

..

No commits in common. "b236928e2b36e1cd25995bdf46920e4c69bd1743" and "f5419ea3f43f269bd56e161ed3949e3b9bbf758e" have entirely different histories.

16 changed files with 508 additions and 500 deletions

File diff suppressed because it is too large Load Diff

View File

@ -26,13 +26,14 @@
bernbot.url = "github:yusdacra/bernbot"; bernbot.url = "github:yusdacra/bernbot";
bernbot.inputs.nixpkgs.follows = "nixpkgs"; bernbot.inputs.nixpkgs.follows = "nixpkgs";
conduit.url = "gitlab:famedly/conduit/next"; blender-bin.url = "github:edolstra/nix-warez?dir=blender";
blender-bin.inputs.nixpkgs.follows = "nixpkgs";
conduit.url = "gitlab:famedly/conduit";
conduit.inputs.nixpkgs.follows = "nixpkgs"; conduit.inputs.nixpkgs.follows = "nixpkgs";
# nil.url = "github:oxalica/nil"; nil.url = "github:oxalica/nil";
# nil.inputs.nixpkgs.follows = "nixpkgs"; nil.inputs.nixpkgs.follows = "nixpkgs";
nixd.url = "github:nix-community/nixd";
nixd.inputs.nixpkgs.follows = "nixpkgs";
stylix.url = "github:yusdacra/stylix/fixed"; stylix.url = "github:yusdacra/stylix/fixed";
stylix.inputs.nixpkgs.follows = "nixpkgs"; stylix.inputs.nixpkgs.follows = "nixpkgs";
@ -53,9 +54,6 @@
limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git"; limbusart.url = "git+https://git.gaze.systems/dusk/limbusart.git";
limbusart.inputs.nixpkgs.follows = "nixpkgs"; limbusart.inputs.nixpkgs.follows = "nixpkgs";
steam-tui.url = "github:dmadisetti/steam-tui";
steam-tui.inputs.nixpkgs.follows = "nixpkgs";
# needed for hyprland setup # needed for hyprland setup
# hyprland.url = "github:hyprwm/Hyprland"; # hyprland.url = "github:hyprwm/Hyprland";
# hyprland.inputs.nixpkgs.follows = "nixpkgs"; # hyprland.inputs.nixpkgs.follows = "nixpkgs";
@ -82,30 +80,18 @@
allPkgs = tlib.genPkgs (x: x); allPkgs = tlib.genPkgs (x: x);
miscApps = miscApps =
lib.mapAttrs
(
_: cmds:
lib.mapAttrs
(_: cmd: {
type = "app";
program = cmd;
})
cmds
)
(
lib.mapAttrs lib.mapAttrs
( (
_: pkgs: { _: pkgs: {
generate-firefox-addons = generate-firefox-addons = {
type = "app";
program =
toString toString
"${pkgs.generate-firefox-addons}/bin/generate-firefox-addons"; "${pkgs.generate-firefox-addons}/bin/generate-firefox-addons";
# buildHost = { };
# type = "app";
# };
} }
) )
allPkgs allPkgs;
);
in { in {
lib = tlib; lib = tlib;
nixosConfigurations = import ./hosts {inherit lib tlib inputs;}; nixosConfigurations = import ./hosts {inherit lib tlib inputs;};

View File

@ -159,5 +159,11 @@ in {
xserver.videoDrivers = ["amdgpu"]; xserver.videoDrivers = ["amdgpu"];
}; };
virtualisation = {
waydroid.enable = false;
podman.enable = false;
libvirtd.enable = false;
};
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }

View File

@ -5,7 +5,7 @@
lib, lib,
... ...
}: let }: let
bernbotPkg = inputs.bernbot.packages.${pkgs.system}.bernbot-release; bernbotPkg = inputs.bernbot.packages.${pkgs.system}.bernbot;
in { in {
systemd.services.bernbot = { systemd.services.bernbot = {
description = "bernbot"; description = "bernbot";

View File

@ -1,12 +1,17 @@
{lib, ...}: let {
pkgs,
lib,
...
}: let
l = lib // builtins; l = lib // builtins;
mkRule = name: type: { mkRule = name: type:
l.toJSON {
inherit name type; inherit name type;
}; };
in { in {
services.ananicy = { services.ananicy = {
enable = true; enable = true;
extraRules = [ extraRules = l.concatStringsSep "\n" [
# coompilers # coompilers
(mkRule "g++" "BG_CPUIO") (mkRule "g++" "BG_CPUIO")
(mkRule "gcc" "BG_CPUIO") (mkRule "gcc" "BG_CPUIO")

View File

@ -0,0 +1,15 @@
_: prev: let
flags = [
"--ignore-gpu-blocklist"
"--disable-gpu-driver-bug-workarounds"
"--enable-features=WebUIDarkMode"
"--enable-gpu-rasterization"
"--enable-zero-copy"
"--force-dark-mode"
"--enable-webrtc-pipewire-capturer"
"--ozone-platform-hint=auto"
];
mkCliArgs = flags: prev.lib.concatStringsSep " " flags;
in {
chromium = prev.chromium.override {commandLineArgs = mkCliArgs flags;};
}

View File

@ -1,3 +0,0 @@
{inputs}: final: prev: {
steam-tui = inputs.steam-tui.packages.${final.system}.default;
}

View File

@ -7,17 +7,20 @@
enable = true; enable = true;
commandLineArgs = [ commandLineArgs = [
"--ozone-platform-hint=auto" "--ozone-platform-hint=auto"
"--enable-features=WaylandWindowDecorations"
"--enable-crashpad"
"--flag-switches-begin" "--flag-switches-begin"
"--enable-webrtc-pipewire-capturer" "--enable-gpu-rasterization"
# "--force-dark-mode" "--enable-unsafe-webgpu"
# "--enable-gpu-rasterization" "--enable-zero-copy"
# "--enable-zero-copy" "--ignore-gpu-blocklist"
# "--ignore-gpu-blocklist" "--disable-gpu-driver-bug-workarounds"
# "--disable-gpu-driver-bug-workarounds"
"--ozone-platform-hint=wayland" "--ozone-platform-hint=wayland"
"--enable-features=SystemNotifications,WaylandWindowDecorations,WebRTCPipeWireCapturer" "--enable-features=SystemNotifications,WaylandWindowDecorations,CanvasOopRasterization,EnableDrDc,RawDraw,WebRTCPipeWireCapturer"
"--disable-features=Vulkan"
"--flag-switches-end" "--flag-switches-end"
"--disk-cache-dir=\"$XDG_RUNTIME_DIR/chromium-cache\"" "--disk-cache-dir=\"$XDG_RUNTIME_DIR/chromium-cache\""
"--process-per-site"
]; ];
extensions = [ extensions = [
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin

View File

@ -9,12 +9,12 @@
".config/discordcanary" ".config/discordcanary"
]; ];
xdg.configFile."discordcanary/settings.json".text = builtins.toJSON { xdg.configFile."discordcanary/settings.json".text = builtins.toJSON {
# openasar = { openasar = {
# setup = true; setup = true;
# noTyping = true; noTyping = true;
# quickstart = true; quickstart = true;
# # theme = builtins.readFile inputs.catppuccin-discord; theme = builtins.readFile inputs.catppuccin-discord;
# }; };
SKIP_HOST_UPDATE = true; SKIP_HOST_UPDATE = true;
IS_MAXIMIZED = true; IS_MAXIMIZED = true;
IS_MINIMIZED = false; IS_MINIMIZED = false;
@ -38,7 +38,7 @@
pkg = pkg =
(pkgs.discord-canary.override { (pkgs.discord-canary.override {
nss = pkgs.nss_latest; nss = pkgs.nss_latest;
# withOpenASAR = true; withOpenASAR = true;
}) })
.overrideAttrs (old: { .overrideAttrs (old: {
preInstall = '' preInstall = ''

View File

@ -6,7 +6,7 @@
stylix.targets.helix.enable = false; stylix.targets.helix.enable = false;
programs.helix = { programs.helix = {
enable = true; enable = true;
languages.language = [ languages = [
{ {
name = "dockerfile"; name = "dockerfile";
roots = ["Dockerfile" "Containerfile"]; roots = ["Dockerfile" "Containerfile"];
@ -14,12 +14,9 @@
} }
{ {
name = "nix"; name = "nix";
language-servers = ["nixd-lsp"]; language-server = {command = "${inputs.nil.packages.${pkgs.system}.default}/bin/nil";};
} }
]; ];
languages.language-server = {
nixd-lsp = {command = "${inputs.nixd.packages.${pkgs.system}.default}/bin/nixd";};
};
settings = { settings = {
theme = "ferra"; theme = "ferra";
editor = { editor = {

View File

@ -1,6 +0,0 @@
{config, pkgs, ...}: {
home.packages = [pkgs.ripcord];
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
".local/share/Ripcord"
];
}

View File

@ -1,7 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.swaylock = { home.packages = [pkgs.swaylock-effects];
package = pkgs.swaylock-effects;
settings = { programs.swaylock.settings = {
screenshot = true; screenshot = true;
ignore-empty-password = true; ignore-empty-password = true;
clock = true; clock = true;
@ -9,5 +9,4 @@
effect-greyscale = true; effect-greyscale = true;
effect-blur = "20x3"; effect-blur = "20x3";
}; };
};
} }

View File

@ -24,17 +24,9 @@ in {
}; };
} }
]; ];
# configure history
history = {
extended = true;
ignorePatterns = ["rm *" "mv *" "l" "ls" "ll" "g s" "git status"];
save = 1000000;
size = 1000000;
};
# xdg compliant # xdg compliant
dotDir = ".config/zsh"; dotDir = ".config/zsh";
history.path = "${config.home.homeDirectory}/.local/share/zsh/history"; history.path = "${config.home.homeDirectory}/.local/share/zsh/history";
# extra stuff for fixing gpg-agent ssh and some random commands
initExtra = '' initExtra = ''
${ ${
lib.optionalString lib.optionalString

View File

@ -112,7 +112,7 @@ in {
# cli stuff # cli stuff
["zoxide" "zsh" "fzf" "starship" "direnv"] ["zoxide" "zsh" "fzf" "starship" "direnv"]
# dev stuff # dev stuff
["helix" "git" "ssh"] ["helix" "code" "git" "ssh"]
["musikcube" "musikcubed"] ["musikcube" "musikcubed"]
]; ];
in in
@ -182,7 +182,7 @@ in {
font-awesome font-awesome
dejavu_fonts dejavu_fonts
# Programs # Programs
pixelorama inputs.blender-bin.packages.x86_64-linux.default
krita krita
gnupg gnupg
imv imv
@ -198,8 +198,7 @@ in {
helvum helvum
nix-output-monitor nix-output-monitor
# prismlauncher # prismlauncher
steamPackages.steamcmd godot_4
steam-tui
]; ];
}; };
programs = { programs = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB