pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'nixos-23.05' (#229) from nixos-23.05 into main
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #229
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
teutat3s 2023-06-28 19:31:27 +02:00
parent 75f7d813d3 ab39518867
commit 1459aa9ada
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
23 changed files with 189 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -38,7 +38,7 @@ _PubSolarOS_:
as much non-free software as you like. as much non-free software as you like.
- Automation is better. The reproducibility of nix feels so much more - Automation is better. The reproducibility of nix feels so much more
powerful once you're deploying your new configuration from your laptop powerful once you're deploying your new configuration from your laptop
to all your other devices with one command. [We have an automated CI using drone](https://ci.b12f.io/pub-solar/os). to all your other devices with one command. [We have an automated CI using drone](https://ci.pub.solar/pub-solar/os).
- Community is important. We just like working on this together, and it - Community is important. We just like working on this together, and it
feels really good to see our progress at the end of a feels really good to see our progress at the end of a
[hakken.irl](https://pub.solar/hakken) session. [hakken.irl](https://pub.solar/hakken) session.

125
flake.lock
View file

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683754942, "lastModified": 1686307493,
"narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=", "narHash": "sha256-R4VEFnDn7nRmNxAu1LwNbjns5DPM8IBsvnrWmZ8ymPs=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d", "rev": "7c16d31383a90e0e72ace0c35d2d66a18f90fb4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +54,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1683779844, "lastModified": 1685948350,
"narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "c80189917086e43d49eece2bd86f56813500a0eb", "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,56 +197,52 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos" "nixos"
],
"utils": "utils_2"
},
"locked": {
"lastModified": 1681092193,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682203081, "lastModified": 1686582345,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "narHash": "sha256-z4wLfa++k1d7Y/tQpQYub1D0K0OO9Wju0FZ8U53KUE0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "rev": "e753d659c64c7d158433d87ef7d6151ca1d1817a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1686501370,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,27 +254,27 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1683928319, "lastModified": 1686431482,
"narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1683965003, "lastModified": 1686452266,
"narHash": "sha256-DrzSdOnLv/yFBvS2FqmwBA2xIbN/Lny/WlxHyoLR9zE=", "narHash": "sha256-zLKiX0iu6jZFeZDpR1gE6fNyMr8eiM8GLnj9SoUCjFs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "81cd886719e10d4822b2a6caa96e95d56cc915ef", "rev": "2a807ad6e8dc458db08588b78cc3c0f0ec4ff321",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,6 +299,30 @@
"type": "github" "type": "github"
} }
}, },
"nvfetcher": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1685158767,
"narHash": "sha256-vgyu3jsnGDDAEYg4y/oFk2IaTCXUlce0ZaLtQprhmFk=",
"owner": "berberman",
"repo": "nvfetcher",
"rev": "c5ae2cb436a04f4590306589e71638d023a33bd4",
"type": "github"
},
"original": {
"owner": "berberman",
"repo": "nvfetcher",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -313,25 +333,26 @@
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware" "nixos-hardware": "nixos-hardware",
"nvfetcher": "nvfetcher"
} }
}, },
"utils": { "systems": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1681028828,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"type": "github" "type": "github"
} }
}, },
"utils_2": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",

35
flake.nix
View file

@ -5,7 +5,7 @@
inputs = { inputs = {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos.url = "github:nixos/nixpkgs/nixos-22.11"; nixos.url = "github:nixos/nixpkgs/nixos-23.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
@ -19,7 +19,7 @@
digga.inputs.darwin.follows = "darwin"; digga.inputs.darwin.follows = "darwin";
digga.inputs.flake-compat.follows = "flake-compat"; digga.inputs.flake-compat.follows = "flake-compat";
home.url = "github:nix-community/home-manager/release-22.11"; home.url = "github:nix-community/home-manager/release-23.05";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
@ -34,6 +34,10 @@
agenix.inputs.darwin.follows = "darwin"; agenix.inputs.darwin.follows = "darwin";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "nixos";
nvfetcher.inputs.flake-compat.follows = "flake-compat";
}; };
outputs = { outputs = {
@ -44,6 +48,7 @@
nixos-hardware, nixos-hardware,
agenix, agenix,
deploy, deploy,
nvfetcher,
... ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake
@ -54,12 +59,20 @@
# allowUnfree = true; # allowUnfree = true;
}; };
supportedSystems = ["x86_64-linux" "aarch64-linux"]; supportedSystems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
channels = { channels = {
nixos = { nixos = {
imports = [(digga.lib.importOverlays ./overlays)]; imports = [(digga.lib.importOverlays ./overlays)];
overlays = []; overlays = [
deploy.overlay
(self: super: {
deploy-rs = {
inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
lib = super.deploy-rs.lib;
};
})
];
}; };
latest = {}; latest = {};
}; };
@ -74,6 +87,7 @@
}); });
}) })
agenix.overlays.default agenix.overlays.default
nvfetcher.overlays.default
(import ./pkgs) (import ./pkgs)
]; ];
@ -149,6 +163,17 @@
homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {}; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
#example = {
# hostname = "example.com:22";
# sshUser = "bartender";
# fastConnect = true;
# profilesOrder = ["system" "direnv"];
# profiles.direnv = {
# user = "bartender";
# path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.bartender;
# };
#};
};
}; };
} }

47
modules/audio/default.nix
View file

@ -66,31 +66,31 @@ in {
# rtkit is optional but recommended # rtkit is optional but recommended
security.rtkit.enable = true; security.rtkit.enable = true;
# Enable sound using pipewire-pulse # Enable sound using pipewire-pulse, default config:
# https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire.conf.in
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
config.pipewire = {
context.default.clock = {
allowed-rates = [44100 48000 88200 96000];
rate = 44100;
};
};
config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
}; };
# Bluetooth configuration using wireplumber # Make pulseaudio listen on port 4713 for mopidy, extending the default
# https://nixos.wiki/wiki/PipeWire#Bluetooth_Configuration # config: https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/daemon/pipewire-pulse.conf.in
environment.etc = mkIf cfg.bluetooth.enable { environment.etc = mkIf cfg.mopidy.enable {
"wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' "pipewire/pipewire-pulse.conf.d/99-custom.conf".text = ''
bluez_monitor.properties = { {
["bluez5.enable-sbc-xq"] = true, "context.modules": [
["bluez5.enable-msbc"] = true, {
["bluez5.enable-hw-volume"] = true, "name": "libpipewire-module-protocol-pulse",
["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" "args": {
"server.address": ["unix:native", "tcp:4713"],
"vm.overrides": {
"pulse.min.quantum": "1024/48000"
}
}
}
]
} }
''; '';
}; };
@ -98,10 +98,19 @@ in {
# Enable bluetooth # Enable bluetooth
hardware.bluetooth = mkIf cfg.bluetooth.enable { hardware.bluetooth = mkIf cfg.bluetooth.enable {
enable = true; enable = true;
# disable useless SIM Access Profile plugin # Disable bluetooth on startup to save battery
powerOnBoot = false;
# Disable useless SIM Access Profile plugin
disabledPlugins = [ disabledPlugins = [
"sap" "sap"
]; ];
settings = {
General = {
# Enables experimental features and interfaces.
# Makes BlueZ Battery Provider available
Experimental = true;
};
};
}; };
services.blueman.enable = mkIf cfg.bluetooth.enable true; services.blueman.enable = mkIf cfg.bluetooth.enable true;

36
modules/audio/pipewire-pulse.conf.json
View file

@ -1,36 +0,0 @@
{
"context.properties": {},
"context.spa-libs": {
"audio.convert.*": "audioconvert/libspa-audioconvert",
"support.*": "support/libspa-support"
},
"context.modules": [
{
"name": "libpipewire-module-rtkit",
"args": {},
"flags": ["ifexists", "nofail"]
},
{
"name": "libpipewire-module-protocol-native"
},
{
"name": "libpipewire-module-client-node"
},
{
"name": "libpipewire-module-adapter"
},
{
"name": "libpipewire-module-metadata"
},
{
"name": "libpipewire-module-protocol-pulse",
"args": {
"server.address": ["unix:native", "tcp:4713"],
"vm.overrides": {
"pulse.min.quantum": "1024/48000"
}
}
}
],
"stream.properties": {}
}

2
modules/core/boot.nix
View file

@ -36,7 +36,7 @@ in {
loader.systemd-boot.enable = lib.mkDefault true; loader.systemd-boot.enable = lib.mkDefault true;
# Use latest LTS linux kernel by default # Use latest LTS linux kernel by default
kernelPackages = lib.mkDefault pkgs.linuxPackages_5_15; kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1;
# Support ntfs drives # Support ntfs drives
supportedFilesystems = ["ntfs"]; supportedFilesystems = ["ntfs"];

1
modules/core/packages.nix
View file

@ -24,6 +24,7 @@ in {
openssh openssh
curl curl
htop htop
btop
lsof lsof
psmisc psmisc
file file

2
modules/core/services.nix
View file

@ -10,7 +10,7 @@
# If you don't want the host to have SSH actually opened up to the net, # If you don't want the host to have SSH actually opened up to the net,
# set `services.openssh.openFirewall` to false in your config. # set `services.openssh.openFirewall` to false in your config.
openFirewall = lib.mkDefault true; openFirewall = lib.mkDefault true;
passwordAuthentication = lib.mkDefault false; settings.PasswordAuthentication = lib.mkDefault false;
}; };
# Service that makes Out of Memory Killer more effective # Service that makes Out of Memory Killer more effective

4
modules/graphical/default.nix
View file

@ -66,7 +66,7 @@ in {
services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}"); services.getty.autologinUser = mkIf cfg.autologin.enable (mkForce "${psCfg.user.name}");
qt5 = { qt = {
enable = true; enable = true;
platformTheme = "gtk2"; platformTheme = "gtk2";
style = "gtk2"; style = "gtk2";
@ -100,7 +100,7 @@ in {
home.packages = [ home.packages = [
alacritty alacritty
foot foot
chromium ungoogled-chromium
firefox-wayland firefox-wayland
flameshot flameshot

2
modules/sway/sway.service.nix
View file

@ -8,10 +8,10 @@
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStartPre = "${pkgs.systemd}/bin/systemctl --user unset-environment WAYLAND_DISPLAY DISPLAY";
ExecStart = "${pkgs.sway}/bin/sway"; ExecStart = "${pkgs.sway}/bin/sway";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = "1"; RestartSec = "1";
TimeoutStopSec = "10"; TimeoutStopSec = "10";
ExecStopPost = "${pkgs.systemd}/bin/systemctl --user unset-environment SWAYSOCK DISPLAY I3SOCK WAYLAND_DISPLAY";
}; };
} }

3
modules/terminal-life/nvim/default.nix
View file

@ -22,6 +22,7 @@ in {
extraPackages = with pkgs; extraPackages = with pkgs;
lib.mkIf (!cfg.lite) [ lib.mkIf (!cfg.lite) [
ansible-language-server
ccls ccls
gopls gopls
nodejs nodejs
@ -34,7 +35,7 @@ in {
nodePackages.vue-language-server nodePackages.vue-language-server
nodePackages.vscode-langservers-extracted nodePackages.vscode-langservers-extracted
nodePackages.yaml-language-server nodePackages.yaml-language-server
python39Packages.python-lsp-server python3Packages.python-lsp-server
python3Full python3Full
solargraph solargraph
rnix-lsp rnix-lsp

2
modules/terminal-life/nvim/lsp.vim
View file

@ -81,6 +81,7 @@ lua <<EOF
local use_denols_for_typescript = not(os.getenv('NVIM_USE_DENOLS') == nil) local use_denols_for_typescript = not(os.getenv('NVIM_USE_DENOLS') == nil)
for lsp_key, lsp_settings in pairs({ for lsp_key, lsp_settings in pairs({
'ansiblels', ---------------------------- Ansible
'bashls', ------------------------------- Bash 'bashls', ------------------------------- Bash
'ccls', --------------------------------- C / C++ / Objective-C 'ccls', --------------------------------- C / C++ / Objective-C
'cssls', -------------------------------- CSS / SCSS / LESS 'cssls', -------------------------------- CSS / SCSS / LESS
@ -147,7 +148,6 @@ lua <<EOF
['schemas'] = { ['schemas'] = {
['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}', ['https://json.schemastore.org/github-workflow'] = '.github/workflows/*.{yml,yaml}',
['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}', ['https://json.schemastore.org/github-action'] = '.github/action.{yml,yaml}',
['https://json.schemastore.org/ansible-stable-2.9'] = 'roles/tasks/*.{yml,yaml}',
['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}', ['https://json.schemastore.org/drone'] = '*.drone.{yml,yaml}',
['https://json.schemastore.org/swagger-2.0'] = 'swagger.{yml,yaml}', ['https://json.schemastore.org/swagger-2.0'] = 'swagger.{yml,yaml}',
} }

2
modules/virtualisation/default.nix
View file

@ -39,7 +39,7 @@ in {
libvirt-glib libvirt-glib
qemu qemu
virt-manager virt-manager
python38Packages.libvirt python3Packages.libvirt
gvfs gvfs
edk2 edk2
OVMF OVMF

14
overlays/overrides.nix
View file

@ -3,20 +3,6 @@ channels: final: prev: {
inherit inherit
(channels.latest) (channels.latest)
cachix
dhall
discord
element-desktop
rage
nix-index
qutebrowser
alejandra
signal-desktop
starship
deploy-rs
tdesktop
arduino
arduino-cli
; ;
haskellPackages = haskellPackages =

5
overlays/waybar.nix
View file

@ -1,5 +0,0 @@
channels: final: prev: {
waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
inherit (prev.sources.waybar-nvfetcher) version src;
});
}

33
pkgs/_sources/generated.nix
View file

@ -1,21 +1,19 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{ {
fetchgit,
fetchurl,
fetchFromGitHub,
}: {
blesh-nvfetcher = { blesh-nvfetcher = {
pname = "blesh-nvfetcher"; pname = "blesh-nvfetcher";
version = "10aa9b4fe47fc07ccdc9d5ba35f1417fdb614d41"; version = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinomyoga"; owner = "akinomyoga";
repo = "ble.sh"; repo = "ble.sh";
rev = "10aa9b4fe47fc07ccdc9d5ba35f1417fdb614d41"; rev = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
fetchSubmodules = true; fetchSubmodules = true;
deepClone = false; deepClone = false;
leaveDotGit = true; leaveDotGit = true;
sha256 = "sha256-5H6kBwHOOF5p+4htTEhTDVoseynTXcFBFfH6d3dYvks="; sha256 = "sha256-+tcM1z9uD7WXA7CfHmTbcPRcZfmXZ+Y7y6Bj4QA3f+4=";
}; };
date = "2023-06-12";
}; };
instant-nvim-nvfetcher = { instant-nvim-nvfetcher = {
pname = "instant-nvim-nvfetcher"; pname = "instant-nvim-nvfetcher";
@ -27,6 +25,7 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4="; sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
}; };
date = "2022-06-25";
}; };
manix = { manix = {
pname = "manix"; pname = "manix";
@ -38,6 +37,7 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw="; sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
}; };
date = "2021-04-20";
}; };
rnix-lsp-nvfetcher = { rnix-lsp-nvfetcher = {
pname = "rnix-lsp-nvfetcher"; pname = "rnix-lsp-nvfetcher";
@ -49,6 +49,7 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ="; sha256 = "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=";
}; };
date = "2022-11-27";
}; };
vim-apprentice-nvfetcher = { vim-apprentice-nvfetcher = {
pname = "vim-apprentice-nvfetcher"; pname = "vim-apprentice-nvfetcher";
@ -60,6 +61,7 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks="; sha256 = "sha256-03B9tmU9+6t2hxhOgZxBqJr9r41CAqhHLUkHYvFdcks=";
}; };
date = "2023-02-15";
}; };
vim-beautify-nvfetcher = { vim-beautify-nvfetcher = {
pname = "vim-beautify-nvfetcher"; pname = "vim-beautify-nvfetcher";
@ -71,6 +73,7 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ="; sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
}; };
date = "2018-12-27";
}; };
vim-caddyfile-nvfetcher = { vim-caddyfile-nvfetcher = {
pname = "vim-caddyfile-nvfetcher"; pname = "vim-caddyfile-nvfetcher";
@ -82,17 +85,19 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o="; sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
}; };
date = "2022-05-09";
}; };
vim-workspace-nvfetcher = { vim-workspace-nvfetcher = {
pname = "vim-workspace-nvfetcher"; pname = "vim-workspace-nvfetcher";
version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; version = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "thaerkh"; owner = "thaerkh";
repo = "vim-workspace"; repo = "vim-workspace";
rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62"; rev = "c0d1e4332a378f58bfdf363b4957168fa78e79b4";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI="; sha256 = "sha256-2Brx098dk5THiieBiW71FG9mUUwS1CSY9mpOPWA/Tq4=";
}; };
date = "2023-05-28";
}; };
vimagit-nvfetcher = { vimagit-nvfetcher = {
pname = "vimagit-nvfetcher"; pname = "vimagit-nvfetcher";
@ -104,16 +109,18 @@
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0="; sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
}; };
date = "2022-07-03";
}; };
waybar-nvfetcher = { waybar-nvfetcher = {
pname = "waybar-nvfetcher"; pname = "waybar-nvfetcher";
version = "09142fa322e080474de0f2dc3ea98036846550df"; version = "41164905351436db3a124207261f9dd759c6fa1b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexays"; owner = "Alexays";
repo = "Waybar"; repo = "Waybar";
rev = "09142fa322e080474de0f2dc3ea98036846550df"; rev = "41164905351436db3a124207261f9dd759c6fa1b";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-5KqQaaKwW14F/rVWGQ0qBUU0b3Z+v/Mq8lnSwqLtT7U="; sha256 = "sha256-aogiOj4pe2AJYxQFh8Dw6xQ2Tb6v4W9zwbGX4t2mStI=";
}; };
date = "2023-06-27";
}; };
} }

3
pkgs/lgcl.nix
View file

@ -1,4 +1,5 @@
self: with self; let self:
with self; let
looking-glass-client = self.looking-glass-client.overrideAttrs (old: { looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
meta.platforms = ["x86_64-linux" "aarch64-linux"]; meta.platforms = ["x86_64-linux" "aarch64-linux"];
}); });

13
pkgs/mopidy-jellyfin.nix
View file

@ -1,19 +1,20 @@
self: with self; let self:
websocket-client = python39.pkgs.buildPythonPackage rec { with self; let
websocket-client = python3.pkgs.buildPythonPackage rec {
pname = "websocket-client"; pname = "websocket-client";
version = "1.2.1"; version = "1.2.1";
doCheck = false; doCheck = false;
src = python39.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0="; sha256 = "sha256-jftxXYqZL1cS//jIQ62ulOIrIqmbLF5rDsShqYHMTg0=";
}; };
}; };
in in
python39.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
pname = "Mopidy-Jellyfin"; pname = "Mopidy-Jellyfin";
version = "1.0.2"; version = "1.0.2";
doCheck = false; doCheck = false;
propagatedBuildInputs = with python39.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
unidecode unidecode
websocket-client websocket-client
requests requests
@ -21,7 +22,7 @@ in
pykka pykka
mopidy mopidy
]; ];
src = python39.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g="; sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
}; };

3
pkgs/uhk-agent.nix
View file

@ -1,4 +1,5 @@
self: with self; let self:
with self; let
uhk-agent-bin = stdenv.mkDerivation rec { uhk-agent-bin = stdenv.mkDerivation rec {
pname = "uhk-agent-bin"; pname = "uhk-agent-bin";
version = "1.5.14"; version = "1.5.14";

2
profiles/base-user/session-variables.nix
View file

@ -85,7 +85,7 @@
VUEDX_TELEMETRY = "off"; VUEDX_TELEMETRY = "off";
# FZF shell history widget default colors # FZF shell history widget default colors
FZF_DEFAULT_OPTS = "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7"; FZF_DEFAULT_OPTS = lib.mkForce "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
}; };
envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables; envListNames = lib.attrsets.mapAttrsToList (name: value: name) variables;

2
shell/devos.nix
View file

@ -59,6 +59,6 @@ in {
] ]
++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [ ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
(devos nixos-generators) (devos nixos-generators)
(devos deploy-rs) (devos deploy-rs.deploy-rs)
]; ];
} }

16
shell/hooks/pre-commit.sh
View file

@ -7,17 +7,27 @@ else
against=$(${git}/bin/git hash-object -t tree /dev/null) against=$(${git}/bin/git hash-object -t tree /dev/null)
fi fi
# Stash only unstaged changes, keeping staged changes
old_stash=$(git rev-parse --quiet --verify refs/stash)
git stash push --quiet --keep-index -m 'Unstaged changes before pre-commit hook'
new_stash=$(git rev-parse --quiet --verify refs/stash)
diff="git diff-index --name-only --cached $against --diff-filter d" diff="git diff-index --name-only --cached $against --diff-filter d"
all_files=($($diff)) mapfile -t all_files < <($diff)
# Format staged files. # Format staged files
if ((${#all_files[@]} != 0)); then if ((${#all_files[@]} != 0)); then
treefmt "${all_files[@]}" && treefmt "${all_files[@]}" &&
git add "${all_files[@]}" git add "${all_files[@]}"
fi fi
# check editorconfig # If unstaged changes were stashed re-apply to working tree
if [ "$old_stash" != "$new_stash" ]; then
git stash pop --quiet
fi
# Check editorconfig
if ((${#all_files[@]} != 0)); then if ((${#all_files[@]} != 0)); then
if ! editorconfig-checker -- "${all_files[@]}"; then if ! editorconfig-checker -- "${all_files[@]}"; then
printf "%b\n" \ printf "%b\n" \

1
treefmt.toml
View file

@ -1,6 +1,7 @@
[formatter.nix] [formatter.nix]
command = "alejandra" command = "alejandra"
includes = ["*.nix"] includes = ["*.nix"]
excludes = ["pkgs/_sources/generated.nix"]
[formatter.prettier] [formatter.prettier]
command = "prettier" command = "prettier"