christoph/flake-nixinator
1
Fork 0
Code Activity

General update before laptop update

Browse Source
This commit is contained in:
Christoph Urlacher
2023-02-21 23:13:28 +01:00
parent 8fdbcd185d
commit b119b72f08
10 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/doom/init.el
View File

@ -190,4 +190,4 @@
:config :config
;;literate ;;literate
(default +bindings +smartparens)) (default +bindings +smartparens)) ; +smartparens

1
config/latex/christex.sty
View File

@ -19,6 +19,7 @@
% Fonts % Fonts
\RequirePackage{beton} % Concrete text font, good with AMS Euler (sehr gut) \RequirePackage{beton} % Concrete text font, good with AMS Euler (sehr gut)
\DeclareFontSeriesDefault[rm]{bf}{sbc} % Concrete fonts have no bold variant
\RequirePackage{eulerpx} % Mischung aus euler und newpxmath (sehr gut) \RequirePackage{eulerpx} % Mischung aus euler und newpxmath (sehr gut)
\let\openbox\relax \let\openbox\relax
\RequirePackage[no-math]{fontspec} \RequirePackage[no-math]{fontspec}

14
config/navi/christoph.cheat
View File

@ -53,3 +53,17 @@ qemu-system-<arch> -cpu help
% discord, flatpak, rich-presence % discord, flatpak, rich-presence
# Enable rich presence for flatpak Discord # Enable rich presence for flatpak Discord
ln -sf $XDG_RUNTIME_DIR/{app/com.discordapp.Discord,}/discord-ipc-0 ln -sf $XDG_RUNTIME_DIR/{app/com.discordapp.Discord,}/discord-ipc-0
% find
# Find files under a certain size in the current directory
find . -type f -name "<glob>" -size -<size>
% objdump, disassemble
# Disassemble an object file
objdump -d -S -M intel "<file>" | bat -l nasm
$ file: exa -1
% pdftocairo, pdf, svg
# Extract svg figure from pdf page
pdftocairo -f <page> -l <page> -svg "<input>" "<output>"
$ input: exa -1

60
flake.lock generated
View File

@ -3,11 +3,11 @@
"adwaita-for-steam": { "adwaita-for-steam": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675017089, "lastModified": 1676153978,
"narHash": "sha256-n7N+mnNJSJiIg6h/ZgyEUjdYVnl37T5GoV/qPhzdb+g=", "narHash": "sha256-KLWsRLFBS5YeirCWkgpg7JrURun+c7mPDK3fx8VCP8o=",
"owner": "tkashkin", "owner": "tkashkin",
"repo": "Adwaita-for-Steam", "repo": "Adwaita-for-Steam",
"rev": "9492a7c2771799870f4fb14a59b77d39a3ccff31", "rev": "1004b9ad09eb9227fb546749e8e72b100a907f4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1675340818, "lastModified": 1676293499,
"narHash": "sha256-GAzTgOvonq4K3CVyyKZGbCnqdLi6nRe78t8ko/mLxL0=", "narHash": "sha256-uIOTlTxvrXxpKeTvwBI1JGDGtCxMXE3BI0LFwoQMhiQ=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "2e19b92980a79118351ec12496a81c49bd674d8a", "rev": "71e3022e3ab20bbf1342640547ef5bc14fb43bf4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1675419601, "lastModified": 1676628719,
"narHash": "sha256-Zt6VnU6CLxaISGmPNMGiD0A9BcgcXJTEuX196M11RYw=", "narHash": "sha256-yZM1hLxPS3OuKNduQSWmiYLAjIZeJ7ExWbCL3A3bi0U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "88dcf53013b1f8f0a6a1766fc76ed181e0a6a8db", "rev": "cd34501a9bcec341533c7131af77572456c100d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674844038, "lastModified": 1676490486,
"narHash": "sha256-ecyiIohYZxUriIkGQXZjHYJuHIQt0IfWqn4RF6GIA/Y=", "narHash": "sha256-9ymCSOGzJw7dTgMgPFfmveyZlN1eItPj13+JkCxmmqU=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "78fb30118a58425a41ead035324c353828200112", "rev": "e3db36cba1ac9b710713d1b2c6a034e09493a5be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +102,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1674550793, "lastModified": 1675933606,
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -123,11 +123,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1675371293, "lastModified": 1676367705,
"narHash": "sha256-LrCjtrAXj/WJphhGEMnHgZs7oTsfOlvPfOjFTIvg39k=", "narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d1c7730bb707bf8124d997952f7babd2a281ae68", "rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1673395322, "lastModified": 1676427677,
"narHash": "sha256-Xwaoz3+/+kCu8Przi1W3MWdQcOQ9wLVrr8nfBN6L6wA=", "narHash": "sha256-nQWh/7131Sv8QUumUmjFOtz9nP66jp5u74Miv+IuGCw=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "46d6e6435edcfa2a4adcfdd95d576979b710f4cb", "rev": "4c5a96f7dbac330306acf626268556da7c62e744",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +207,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1667629849, "lastModified": 1676300157,
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -239,11 +239,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1675273418, "lastModified": 1676481215,
"narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", "narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", "rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -255,11 +255,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1675429365, "lastModified": 1676619352,
"narHash": "sha256-KXPNBZkCq4EJlQy9IzcpMsGSyusd/DJ90J97PpnnCB0=", "narHash": "sha256-a9pQbtOcUYS9boD6+lQqPe0WzME0x8yzZk365w9XGbM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "50bf97d8b0943d8c58b3881ed7e2467c6556a22f", "rev": "d2d70316f27384cf53e0f3c6cf2fd73e4744555a",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
home/christoph/default.nix
View File

@ -316,7 +316,7 @@ rec {
# Media # Media
wacomtablet wacomtablet
blender # blender
godot godot
obs-studio obs-studio
vlc # Addition to mpv without any shaders etc vlc # Addition to mpv without any shaders etc
@ -420,6 +420,7 @@ rec {
keychain = { keychain = {
enable = true; enable = true;
enableFishIntegration = config.modules.fish.enable; enableFishIntegration = config.modules.fish.enable;
enableNushellIntegration = false;
enableXsessionIntegration = true; enableXsessionIntegration = true;
agents = ["ssh"]; agents = ["ssh"];
keys = ["id_ed25519"]; keys = ["id_ed25519"];
@ -453,6 +454,11 @@ rec {
enableFishIntegration = config.modules.fish.enable; enableFishIntegration = config.modules.fish.enable;
}; };
nushell = {
enable = true;
};
# Git status replacement with file selection by number # Git status replacement with file selection by number
scmpuff = { scmpuff = {
enable = true; enable = true;

2
home/christoph/nixinator/default.nix
View File

@ -46,7 +46,7 @@ rec {
bottles.enable = true; bottles.enable = true;
discordChromium.enable = true; discordChromium.enable = true;
discordElectron.enable = false; # This is the nixpkgs version, prefer the one from flatpak module discordElectron.enable = false; # This is the nixpkgs version, prefer the one from flatpak module
dwarffortress.enable = true; dwarffortress.enable = false;
steam = { steam = {
enable = true; enable = true;

12
home/christoph/nixtop/default.nix
View File

@ -16,18 +16,6 @@ rec {
]; ];
modules = { modules = {
audio = {
enable = true;
noisesuppression = {
noisetorch.enable = true;
noisetorch.autostart = true;
};
};
# TODO: Validate that this doesn't install too much
gaming = {
enable = true;
discordChromium.enable = true;
};
}; };
} }

28
home/modules/firefox.nix
View File

@ -98,6 +98,20 @@ in {
}; };
}; };
profiles = {
default = {
id = 0; # 0 is default profile
userChrome = concatStringsSep "\n" [
(optionalString cfg.gnomeTheme ''
@import "${pkgs.firefox-gnome-theme}/share/firefox-gnome-theme/gnome-theme.css";
'')
(optionalString cfg.disableTabBar ''
#TabsToolbar { display: none; }
'')
];
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = with pkgs.nur.repos.rycee.firefox-addons; [
amp2html amp2html
augmented-steam augmented-steam
@ -141,20 +155,6 @@ in {
youtube-shorts-block youtube-shorts-block
]; ];
profiles = {
default = {
id = 0; # 0 is default profile
userChrome = concatStringsSep "\n" [
(optionalString cfg.gnomeTheme ''
@import "${pkgs.firefox-gnome-theme}/share/firefox-gnome-theme/gnome-theme.css";
'')
(optionalString cfg.disableTabBar ''
#TabsToolbar { display: none; }
'')
];
settings = mkMerge [ settings = mkMerge [
(optionalAttrs cfg.vaapi { (optionalAttrs cfg.vaapi {
# Firefox wayland hardware video acceleration # Firefox wayland hardware video acceleration

3
home/modules/fish.nix
View File

@ -62,6 +62,9 @@ in {
# ssh locations # ssh locations
xxhamster = "TERM=ansi ssh christoph@217.160.142.51"; xxhamster = "TERM=ansi ssh christoph@217.160.142.51";
# disassemble
disassemble = "objdump -d -S -M intel";
} }
# Abbrs only available if package is installed # Abbrs only available if package is installed

2
home/modules/neovim.nix
View File

@ -16,7 +16,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
# TODO: Configure by enabled editor # TODO: Configure by option
home.sessionVariables = { home.sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
VISUAL = "nvim"; VISUAL = "nvim";