chayleaf/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update inputs

Browse source 
sway doesn't work with vulkan anymore, so make vulkan sway an option
This commit is contained in:
chayleaf 2023-05-10 16:42:56 +07:00
parent 051b8e41e9
commit 8655459e46
13 changed files with 118 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/_sources/generated.json
View file

@ -23,11 +23,11 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-tPL8d5fJzT428UJImJgzW9ECI+ENkvbD1fCPmjU7Yhk=", "sha256": "sha256-gof4yL5sHPKXDC4mDfPyBIvPtWxxxVy6gHx58yoTEbQ=",
"type": "url", "type": "url",
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-54/GE-Proton7-54.tar.gz" "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-2/GE-Proton8-2.tar.gz"
}, },
"version": "GE-Proton7-54" "version": "GE-Proton8-2"
}, },
"yomichan": { "yomichan": {
"cargoLocks": null, "cargoLocks": null,

6
home/_sources/generated.nix
View file

@ -11,10 +11,10 @@
}; };
proton-ge = { proton-ge = {
pname = "proton-ge"; pname = "proton-ge";
version = "GE-Proton7-54"; version = "GE-Proton8-2";
src = fetchurl { src = fetchurl {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton7-54/GE-Proton7-54.tar.gz"; url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-2/GE-Proton8-2.tar.gz";
sha256 = "sha256-tPL8d5fJzT428UJImJgzW9ECI+ENkvbD1fCPmjU7Yhk="; sha256 = "sha256-gof4yL5sHPKXDC4mDfPyBIvPtWxxxVy6gHx58yoTEbQ=";
}; };
}; };
yomichan = { yomichan = {

4
home/common/i3-sway.nix
View file

@ -324,8 +324,10 @@ in
}; };
menu = "${rofiSway}/bin/rofi -show drun"; menu = "${rofiSway}/bin/rofi -show drun";
}; in commonConfig // swayConfig; }; in commonConfig // swayConfig;
extraSessionCommands = '' # export WLR_RENDERER=vulkan
extraSessionCommands = (lib.optionalString config.wayland.windowManager.sway.vulkan ''
export WLR_RENDERER=vulkan export WLR_RENDERER=vulkan
'') + ''
export SDL_VIDEODRIVER=wayland,x11,kmsdrm,windows,directx export SDL_VIDEODRIVER=wayland,x11,kmsdrm,windows,directx
# SDL3 # SDL3
export SDL_VIDEO_DRIVER=wayland,x11,kmsdrm,windows export SDL_VIDEO_DRIVER=wayland,x11,kmsdrm,windows

12
home/common/nvim.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, notlua, ... }:
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
/* /*
@ -14,9 +14,8 @@
# welcome to my cursed DSL # welcome to my cursed DSL
programs.neovim = let programs.neovim = let
notlua = config.notlua;
notlua-nvim = notlua.neovim { inherit (config.programs.neovim) plugins extraLuaPackages; }; notlua-nvim = notlua.neovim { inherit (config.programs.neovim) plugins extraLuaPackages; };
inherit (notlua.keywords) CALL PROP SET LET DEFUN IF APPLY OR EQ RETURN ELSE IDX MCALL LETREC; inherit (notlua.keywords) CALL PROP SET LET DEFUN IF APPLY OR EQ RETURN ELSE IDX LETREC;
inherit (notlua.utils) compile; inherit (notlua.utils) compile;
inherit (notlua-nvim.stdlib) vim string require print; inherit (notlua-nvim.stdlib) vim string require print;
inherit (notlua-nvim.keywords) REQ REQ'; inherit (notlua-nvim.keywords) REQ REQ';
@ -294,11 +293,14 @@
ps.cmp_luasnip ps.cmp_luasnip
ps.cmp-nvim-lsp ps.cmp-nvim-lsp
{ plugin = ps.nvim-autopairs; { plugin = ps.nvim-autopairs;
config = compile "nvim_autopairs" (LET (REQ "nvim-autopairs.completion.cmp") (REQ "nvim-autopairs") (cmp-autopairs: nvim-autopairs: L [ config = compile "nvim_autopairs" (LET
(REQ "cmp") (REQ "nvim-autopairs.completion.cmp") (REQ "nvim-autopairs")
(cmp: cmp-autopairs: nvim-autopairs:
L [
nvim-autopairs.setup { nvim-autopairs.setup {
disable_filetype = [ "TelescopePrompt" "vim" ]; disable_filetype = [ "TelescopePrompt" "vim" ];
} _ } _
MCALL cmp.event "on" "confirm_done" (cmp-autopairs.on_confirm_done {}) _ cmp.event.on cmp.event "confirm_done" (cmp-autopairs.on_confirm_done {}) _
])); } ])); }
{ plugin = ps.comment-nvim; { plugin = ps.comment-nvim;
config = compile' "comment_nvim" [ config = compile' "comment_nvim" [

7
home/common/options.nix
View file

@ -10,10 +10,15 @@ with lib; {
}; };
}; };
}; };
options.wayland.windowManager.sway.vulkan = mkOption {
type = types.bool;
default = false;
description = "set WLR_RENDERER to vulkan";
};
options.terminals = mkOption { options.terminals = mkOption {
type = with types; listOf str; type = with types; listOf str;
description = "terminal kinds (possible values are alacritty, urxvt, kitty, foot)"; description = "terminal kinds (possible values are alacritty, urxvt, kitty, foot)";
default = ["alacritty"]; default = [ "alacritty" ];
}; };
options.terminalBin = mkOption { options.terminalBin = mkOption {
type = types.str; type = types.str;

4
home/common/terminal.nix
View file

@ -15,6 +15,7 @@ in {
terminalBin = getTerminalBin (builtins.head config.terminals); terminalBin = getTerminalBin (builtins.head config.terminals);
terminalBinX = getTerminalBin (lib.lists.findFirst (term: term != "foot") null config.terminals); terminalBinX = getTerminalBin (lib.lists.findFirst (term: term != "foot") null config.terminals);
colors = { colors = {
# dont forget to change waybar.css (yes I'm lazy like that)
base = [ base = [
"523b3f" # black "523b3f" # black
"e66e6e" # red "e66e6e" # red
@ -35,8 +36,7 @@ in {
]; ];
foreground = "ebdadd"; foreground = "ebdadd";
background = "24101a"; background = "24101a";
# 0.75 with opengl sway alpha = if config.wayland.windowManager.sway.vulkan then 0.97 else 0.85;
alpha = 0.95;
}; };
programs.tmux.shell = shell; programs.tmux.shell = shell;
programs.alacritty = { programs.alacritty = {

2
home/common/waybar.css
View file

@ -1,4 +1,4 @@
@define-color bg rgba(36, 16, 26, /*.75*/ .95); /*#24101ac0;*/ @define-color bg rgba(36, 16, 26, .75); /*#24101ac0;*/
@define-color blue #87e5cf; @define-color blue #87e5cf;
@define-color green #8cbf73; @define-color green #8cbf73;
@define-color yellow #ebbe5f; @define-color yellow #ebbe5f;

50
home/flake.lock
View file

@ -4,15 +4,14 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1680597706, "lastModified": 1683651229,
"narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", "narHash": "sha256-HN0Mw8g1XQIrcdyzqT00YW0Uqi/V/BUUUAgvcK1pcSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", "rev": "983f8a1bb965b261492123cd8e2d07da46d4d50a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680655986, "lastModified": 1683465499,
"narHash": "sha256-u6gs9B6ckuL3dXjI/LdATeXltEh04DYxCk6vZtF/WEs=", "narHash": "sha256-7dufJBJ/AY4vd5x+2kR9Xj39ydmFf9JhzoDAF/NxeLM=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "9ba4a24198646582e208ec8cdf5e8324be23e2d7", "rev": "6e2819c51586b34106360e261bad1e1c4d4f783b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,10 +42,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680669251, "lastModified": 1683408522,
"narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"path": "/nix/store/qw9nnl2wmvx0ad0f9aqvdbw5cl5mirvc-source", "path": "/nix/store/zjpd6dn9kza8zl3l17cwgyifsxbvi3nb-source",
"rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -61,11 +60,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682122379, "lastModified": 1682202201,
"narHash": "sha256-AxO/KWnMuxTA/WrRitIwUJzc7F90BPjxdej6jLJi0So=", "narHash": "sha256-3r5izcrgfO2RxV1gU7aWQnGAky5Ek3wyzM+9eQtG4M4=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "notlua", "repo": "notlua",
"rev": "5b8280bc82fd0b4624af9256388f0f7804a1bb4d", "rev": "cd89a08083cc43a07ac1f6ced0594fa7f49c5cf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,11 +76,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1680758135, "lastModified": 1683707801,
"narHash": "sha256-gmTwQ6VHbXAfXbBgeqXZyyuEb0Hhroi8IOM/nokBOwM=", "narHash": "sha256-fEoovtx4OXwftUoiRTnPP+dCDJKUE3KXO/rKxNqueQ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9570cfc60f7ca32fdcdc4292f1e24ea5c62977bd", "rev": "c524842d10fe65f19e0bb544b39d805e0b5d6d8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,21 +97,6 @@
"notlua": "notlua", "notlua": "notlua",
"nur": "nur" "nur": "nur"
} }
},
"utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
home/flake.nix
View file

@ -51,10 +51,10 @@
]; ];
}; };
extraSpecialArgs = { extraSpecialArgs = {
notlua = notlua.lib.${system};
# pkgs-wayland = nixpkgs-wayland.packages.${system}; # pkgs-wayland = nixpkgs-wayland.packages.${system};
}; };
modules = [ modules = [
notlua.nixosModules.default
nur.nixosModules.nur nur.nixosModules.nur
./hosts/nixmsi.nix ./hosts/nixmsi.nix
(getPriv "nixmsi") (getPriv "nixmsi")

4
home/pkgs/default.nix
View file

@ -13,9 +13,9 @@ in
clang-tools_latest = pkgs.clang-tools_15; clang-tools_latest = pkgs.clang-tools_15;
clang_latest = pkgs.clang_15; clang_latest = pkgs.clang_15;
home-daemon = callPackage ./home-daemon { }; home-daemon = callPackage ./home-daemon { };
ghidra = pkgs.ghidra.overrideAttrs (old: { /*ghidra = pkgs.ghidra.overrideAttrs (old: {
patches = old.patches ++ [ ./ghidra-stdcall.patch ]; patches = old.patches ++ [ ./ghidra-stdcall.patch ];
}); });*/
lalrpop = callPackage ./lalrpop { }; lalrpop = callPackage ./lalrpop { };
# pin version # pin version
looking-glass-client = pkgs.looking-glass-client.overrideAttrs (old: { looking-glass-client = pkgs.looking-glass-client.overrideAttrs (old: {

54
system/flake.lock
View file

@ -1,12 +1,15 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1681202837,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +35,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1675359654, "lastModified": 1682268411,
"narHash": "sha256-FPxzuvJkcO49g4zkWLSeuZkln54bLoTtrggZDJBH90I=", "narHash": "sha256-ICDKQ7tournRVtfM8C2II0qHiOZOH1b3dXVOCsgr11o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "6138eb8e737bffabd4c8fc78ae015d4fd6a7e2fd", "rev": "df1692e2d9f1efc4300b1ea9201831730e0b817d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -52,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680655986, "lastModified": 1683465499,
"narHash": "sha256-u6gs9B6ckuL3dXjI/LdATeXltEh04DYxCk6vZtF/WEs=", "narHash": "sha256-7dufJBJ/AY4vd5x+2kR9Xj39ydmFf9JhzoDAF/NxeLM=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "9ba4a24198646582e208ec8cdf5e8324be23e2d7", "rev": "6e2819c51586b34106360e261bad1e1c4d4f783b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +70,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1680070330, "lastModified": 1683269598,
"narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=", "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421", "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +85,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680669251, "lastModified": 1683408522,
"narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680747499, "lastModified": 1683685144,
"narHash": "sha256-E9rcxSTsqRqNd4SD+D/4aqm3qfFyVw0S9YseCks7h+c=", "narHash": "sha256-HZBieMZj9Rp+WtbGiK5JaUciZwJ/2YX6LRe5z8jkfow=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8ad3b5ee01a2074b54274216ff2cf0ab844a7426", "rev": "74e44edb87aeed50798f5b81795ebad250d4a0c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,6 +130,21 @@
"type": "github" "type": "github"
} }
}, },
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2" "flake-utils": "flake-utils_2"

57
system/hosts/nixmsi.nix
View file

@ -9,6 +9,27 @@ let
dataPart = "/dev/disk/by-uuid/f1447692-fa7c-4bd6-9cb5-e44c13fddfe3"; dataPart = "/dev/disk/by-uuid/f1447692-fa7c-4bd6-9cb5-e44c13fddfe3";
datarootUuid = "fa754b1e-ac83-4851-bf16-88efcd40b657"; datarootUuid = "fa754b1e-ac83-4851-bf16-88efcd40b657";
dataroot = "/dev/disk/by-uuid/${datarootUuid}"; dataroot = "/dev/disk/by-uuid/${datarootUuid}";
/*
# for old kernel versions
zenKernels = pkgs.callPackage "${nixpkgs}/pkgs/os-specific/linux/kernel/zen-kernels.nix";
zenKernel = (version: sha256: (zenKernels {
kernelPatches = [
pkgs.linuxKernel.kernelPatches.bridge_stp_helper
pkgs.linuxKernel.kernelPatches.request_key_helper
];
argsOverride = {
src = pkgs.fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
inherit sha256;
};
inherit version;
modDirVersion = lib.versions.pad 3 "${version}-zen1";
};
}).zen);
zenKernelPackages = version: sha256: pkgs.linuxPackagesFor (zenKernel version sha256);
*/
in { in {
system.stateVersion = "22.11"; system.stateVersion = "22.11";
@ -45,6 +66,11 @@ in {
"resume_offset=533760" "resume_offset=533760"
"fbcon=font:TER16x32" "fbcon=font:TER16x32"
"consoleblank=60" "consoleblank=60"
# disable PSR to *hopefully* avoid random hangs
# this one didnt help
"amdgpu.dcdebugmask=0x10"
# maybe this one will?
"amdgpu.noretry=0"
]; ];
loader = { loader = {
grub = { grub = {
@ -65,29 +91,12 @@ in {
"vm.swappiness" = 40; "vm.swappiness" = 40;
}; };
kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; kernelPackages = lib.mkDefault pkgs.linuxPackages_zen;
/*kernelPackages = zenKernelPackages "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv";*/
}; };
# for testing different zen kernel versions: # for testing different zen kernel versions:
# specialisation = let # specialisation = {
# zenKernels = pkgs.callPackage "${nixpkgs}/pkgs/os-specific/linux/kernel/zen-kernels.nix"; # zen619.configuration.boot.kernelPackages = zenKernelPackages "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv";
# zenKernel = (version: sha256: (zenKernels {
# kernelPatches = [
# pkgs.linuxKernel.kernelPatches.bridge_stp_helper
# pkgs.linuxKernel.kernelPatches.request_key_helper
# ];
# argsOverride = {
# src = pkgs.fetchFromGitHub {
# owner = "zen-kernel";
# repo = "zen-kernel";
# rev = "v${version}-zen1";
# inherit sha256;
# };
# inherit version;
# modDirVersion = lib.versions.pad 3 "${version}-zen1";
# };
# }).zen);
# in {
# zen619.configuration.boot.kernelPackages = pkgs.linuxPackagesFor (zenKernel "6.1.9" "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv");
# }; # };
nixpkgs.config.allowUnfreePredicate = pkg: (lib.getName pkg) == "steam-original"; nixpkgs.config.allowUnfreePredicate = pkg: (lib.getName pkg) == "steam-original";
@ -99,6 +108,7 @@ in {
opengl.extraPackages = with pkgs; [ vulkan-validation-layers ]; opengl.extraPackages = with pkgs; [ vulkan-validation-layers ];
}; };
services.tlp.enable = true;
services.tlp.settings = { services.tlp.settings = {
USB_EXCLUDE_PHONE = 1; USB_EXCLUDE_PHONE = 1;
START_CHARGE_THRESH_BAT0 = 75; START_CHARGE_THRESH_BAT0 = 75;
@ -235,9 +245,14 @@ in {
# I couldn't get lightdm to start sway, so let's just do this # I couldn't get lightdm to start sway, so let's just do this
displayManager.startx.enable = true; displayManager.startx.enable = true;
windowManager.i3.enable = true; windowManager.i3.enable = true;
};*/ };
*/
programs.sway.enable = true; programs.sway.enable = true;
programs.firejail.enable = true; programs.firejail.enable = true;
# doesn't work:
# programs.wireshark.enable = true;
# users.groups.wireshark.members = [ "user "];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
wget wget

2
system/modules/impermanence.nix
View file

@ -37,7 +37,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# as weird as it sounds, I won't use tmpfs for /tmp in case I'll have to put files over 2GB there # as weird as it sounds, I won't use tmpfs for /tmp in case I'll have to put files over 2GB there
boot.cleanTmpDir = lib.mkIf cfg.persistTmp true; boot.tmp.cleanOnBoot = lib.mkIf cfg.persistTmp true;
environment.persistence.${toString cfg.path} = { environment.persistence.${toString cfg.path} = {
hideMounts = true; hideMounts = true;
directories = map toString ([ directories = map toString ([