lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Daniel Flanagan 2024-03-21 10:15:17 -05:00
commit 85fa907283
19 changed files with 186 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
flake.lock
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701025348, "lastModified": 1709610799,
"narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=", "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b", "rev": "81c393c776d5379c030607866afef6406ca1be57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708910350, "lastModified": 1710427903,
"narHash": "sha256-cTuJVlOm05aQFIgGuYikgkrI61P2vTO2OfXwIRWEzUg=", "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a13f36255cf4ce99cc4236a34251c2e7106e101d", "rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -83,11 +83,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1709126324,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +137,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1709147990, "lastModified": 1710123225,
"narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -158,11 +158,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1709201369, "lastModified": 1710593447,
"narHash": "sha256-L1n9nSYMvkHFctaMkIuCfBMxJ6qGhgsta0SBi0Gcld0=", "narHash": "sha256-cL3LPle9oIqItLfkEJ7PBYe5YLxs5WoiY2GcwSUeIDs=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "d0bb77447138f5f70f96b174a8f29045a956c8c4", "rev": "6fea7876a47df8627a4b40361a6fc0f692c6601f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1710532761,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700794826, "lastModified": 1709479366,
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1709677081, "lastModified": 1710420202,
"narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=", "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "880992dcc006a5e00dd0591446fdf723e6a51a64", "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +259,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709150264, "lastModified": 1710451336,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=", "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701137803, "lastModified": 1709604635,
"narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=", "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "9dd940c967502f844eacea52a61e9596268d4f70", "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708987867, "lastModified": 1710433464,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090",
"type": "github" "type": "github"
}, },
"original": { "original": {

75
modules/home-manager/helix.nix
View file

@ -1,4 +1,5 @@
{ {
config,
pkgs, pkgs,
inputs, inputs,
colors, colors,
@ -6,6 +7,25 @@
}: let }: let
inherit (pkgs) system; inherit (pkgs) system;
in { in {
# helix rust debugger stuff
# https://github.com/helix-editor/helix/wiki/Debugger-Configurations
home.file."${config.xdg.configHome}/lldb_vscode_rustc_primer.py" = {
text = ''
import subprocess
import pathlib
import lldb
# Determine the sysroot for the active Rust interpreter
rustlib_etc = pathlib.Path(subprocess.getoutput('rustc --print sysroot')) / 'lib' / 'rustlib' / 'etc'
if not rustlib_etc.exists():
raise RuntimeError('Unable to determine rustc sysroot')
# Load lldb_lookup.py and execute lldb_commands with the correct path
lldb.debugger.HandleCommand(f"""command script import "{rustlib_etc / 'lldb_lookup.py'}" """)
lldb.debugger.HandleCommand(f"""command source -s 0 "{rustlib_etc / 'lldb_commands'}" """)
'';
};
programs.helix = { programs.helix = {
enable = true; enable = true;
package = inputs.helix.packages.${system}.helix; package = inputs.helix.packages.${system}.helix;
@ -51,6 +71,31 @@ in {
# language-servers = ["lexical"]; # "lexical" "next-ls" ? # language-servers = ["lexical"]; # "lexical" "next-ls" ?
# auto-format = true; # auto-format = true;
# } # }
{
name = "rust";
debugger = {
name = "lldb-vscode";
transport = "stdio";
command = "lldb-vscode";
templates = [
{
name = "binary";
request = "launch";
completion = [
{
name = "binary";
completion = "filename";
}
];
args = {
program = "{0}";
initCommands = ["command script import ${config.xdg.configHome}/lldb_vscode_rustc_primer.py"];
};
}
];
};
}
{ {
name = "html"; name = "html";
file-types = ["html"]; file-types = ["html"];
@ -77,36 +122,6 @@ in {
unit = "\t"; unit = "\t";
}; };
} }
{
name = "javascript";
file-types = ["js" "mjs"];
scope = "source.js";
auto-format = true;
}
{
name = "typescript";
file-types = ["ts" "mts"];
scope = "source.ts";
auto-format = true;
}
{
name = "jsx";
file-types = ["jsx"];
scope = "source.jsx";
auto-format = true;
}
{
name = "tsx";
file-types = ["tsx"];
scope = "source.tsx";
auto-format = true;
}
{
name = "jsonc";
file-types = ["jsonc"];
scope = "source.jsonc";
auto-format = true;
}
# { # {
# name = "javascript"; # name = "javascript";

2
modules/home-manager/mako.nix
View file

@ -4,7 +4,7 @@
... ...
}: { }: {
services.mako = with colors.withHashPrefix; { services.mako = with colors.withHashPrefix; {
enable = true; enable = false; # mako is launched alongside the wm/de instead
borderSize = 1; borderSize = 1;
maxVisible = 5; maxVisible = 5;
defaultTimeout = 15000; defaultTimeout = 15000;

4
modules/home-manager/senpai.nix
View file

@ -2,8 +2,8 @@
programs.senpai = { programs.senpai = {
enable = true; enable = true;
config = { config = {
addr = "a"; address = "a";
nick = "a"; nickname = "a";
}; };
}; };

1
modules/home-manager/sway.nix
View file

@ -145,6 +145,7 @@
"timeout 600 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'" "timeout 600 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'"
]; ];
} }
# {command = "mako";}
# {command = "firefox";} # {command = "firefox";}
# {command = "wezterm";} # {command = "wezterm";}
{command = "kitty --single-instance";} {command = "kitty --single-instance";}

11
modules/nixos/development-tools.nix
View file

@ -1,8 +1,18 @@
{pkgs, ...}: { {pkgs, ...}: {
environment.sessionVariables.NIXOS_OZONE_WL = "1";
programs.neovim = {
enable = true;
# plugins = [
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
# ];
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
taplo # toml language server for editing helix configs per repo
watchexec watchexec
android-tools android-tools
kubectl kubectl
vscode
stern stern
libresprite libresprite
logseq logseq
@ -10,6 +20,7 @@
wol wol
shellcheck shellcheck
shfmt shfmt
vscode-langservers-extracted
nodePackages.bash-language-server nodePackages.bash-language-server
nodePackages.yaml-language-server nodePackages.yaml-language-server
xh xh

2
modules/nixos/kde-plasma.nix
View file

@ -11,7 +11,7 @@
services.xserver.enable = lib.mkDefault true; services.xserver.enable = lib.mkDefault true;
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;

1
modules/nixos/sway.nix
View file

@ -58,6 +58,7 @@
libinput libinput
libinput-gestures libinput-gestures
libnotify libnotify
# mako
# lutris # lutris
# nil # nil
# nixpkgs-fmt # nixpkgs-fmt

2
nixos/dragon.nix
View file

@ -68,8 +68,6 @@
# }; # };
# }; # };
services.mako.enable = lib.mkForce false; # don't use mako when using plasma
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
env = [ env = [

95
nixos/foxtrot.nix
View file

@ -21,16 +21,51 @@ in {
# postgres # postgres
wifi wifi
# hyprland # hyprland
{
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
# programs.steam.package = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.steam;
programs.steam.remotePlay.openFirewall = true;
services.udev.packages = with pkgs; [steam];
}
{
# laptop power management
services.upower.enable = true;
swapDevices = [
# TODO: move this to disko?
# NOTE(oninstall):
# sudo btrfs subvolume create /swap
# sudo btrfs filesystem mkswapfile --size 32g --uuid clear /swap/swapfile
# sudo swapon /swap/swapfile
{device = "/swap/swapfile";}
];
# findmnt -no UUID -T /swap/swapfile
boot.resumeDevice = "/dev/disk/by-uuid/81c3354a-f629-4b6b-a249-7705aeb9f0d5";
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
services.fwupd.enable = true;
# source: https://github.com/NixOS/nixos-hardware/tree/master/framework/13-inch/7040-amd#getting-the-fingerprint-sensor-to-work
# we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware
# services.fwupd.package =
# (import (builtins.fetchTarball {
# url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
# sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
# }) {
# inherit (pkgs) system;
# })
# .fwupd;
services.fwupd.extraRemotes = ["lvfs-testing"];
services.logind = {
lidSwitch = "suspend-then-hibernate";
# HandleLidSwitchDocked=ignore
extraConfig = ''
HandlePowerKey=suspend-then-hibernate
IdleActionSec=10m
IdleAction=suspend-then-hibernate
'';
};
}
]; ];
services.xserver.enable = true;
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
# programs.steam.package = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.steam;
programs.steam.remotePlay.openFirewall = true;
services.udev.packages = with pkgs; [steam];
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
steam steam
@ -58,7 +93,6 @@ in {
# wallpaper-manager # wallpaper-manager
# hyprland # hyprland
]; ];
home = { home = {
stateVersion = "24.05"; stateVersion = "24.05";
pointerCursor = { pointerCursor = {
@ -98,49 +132,6 @@ in {
}; };
}; };
services.upower.enable = true;
# use updated ppd for framework 13:
# source: https://community.frame.work/t/tracking-ppd-v-tlp-for-amd-ryzen-7040/39423/137?u=lytedev
swapDevices = [
# TODO: move this to disko?
# NOTE(oninstall):
# sudo btrfs subvolume create /swap
# sudo btrfs filesystem mkswapfile --size 32g --uuid clear /swap/swapfile
# sudo swapon /swap/swapfile
{device = "/swap/swapfile";}
];
# findmnt -no UUID -T /swap/swapfile
boot.resumeDevice = "/dev/disk/by-uuid/81c3354a-f629-4b6b-a249-7705aeb9f0d5";
services.logind = {
lidSwitch = "suspend-then-hibernate";
# HandleLidSwitchDocked=ignore
extraConfig = ''
HandlePowerKey=suspend-then-hibernate
IdleActionSec=10m
IdleAction=suspend-then-hibernate
'';
};
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
services.fwupd.enable = true;
# source: https://github.com/NixOS/nixos-hardware/tree/master/framework/13-inch/7040-amd#getting-the-fingerprint-sensor-to-work
# we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware
# services.fwupd.package =
# (import (builtins.fetchTarball {
# url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz";
# sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk";
# }) {
# inherit (pkgs) system;
# })
# .fwupd;
services.fwupd.extraRemotes = ["lvfs-testing"];
hardware.opengl.extraPackages = [ hardware.opengl.extraPackages = [
# pkgs.rocmPackages.clr.icd # pkgs.rocmPackages.clr.icd
pkgs.amdvlk pkgs.amdvlk

5
templates/deno/.gitignore vendored
View file

@ -1,2 +1,5 @@
/target # nix build results
/result
# direnv cache
/.direnv /.direnv

10
templates/deno/deno.json Normal file
View file

@ -0,0 +1,10 @@
{
"tasks": {
"dev": "deno run -A --watch=src,mod.ts mod.ts"
},
"fmt": {
"useTabs": true,
"semiColons": false,
"singleQuote": true
}
}

10
templates/deno/deno.jsonc
View file

@ -1,10 +0,0 @@
{
"tasks": {
"dev": "deno run -A --watch=src src/mod.ts",
},
"fmt": {
"useTabs": true,
"semiColons": false,
"singleQuote": true,
},
}

9
templates/deno/flake.nix
View file

@ -6,7 +6,13 @@
nixpkgs, nixpkgs,
}: let }: let
inherit (self) outputs; inherit (self) outputs;
supportedSystems = ["x86_64-linux"]; supportedSystems = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
forEachSupportedSystem = nixpkgs.lib.genAttrs supportedSystems; forEachSupportedSystem = nixpkgs.lib.genAttrs supportedSystems;
in { in {
devShells = forEachSupportedSystem (system: let devShells = forEachSupportedSystem (system: let
@ -14,6 +20,7 @@
in { in {
deno-dev = pkgs.mkShell { deno-dev = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
vscode-langservers-extracted
deno deno
curl curl
xh xh

0
templates/deno/src/mod.ts → templates/deno/mod.ts
View file

9
templates/elixir/flake.nix
View file

@ -10,14 +10,15 @@
}: let }: let
inherit (self) outputs; inherit (self) outputs;
systems = [ supportedSystems = [
"aarch64-linux" "aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
"x86_64-linux" "x86_64-linux"
"x86_64-darwin"
"aarch64-darwin"
]; ];
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
nixpkgsFor = system: import nixpkgs {inherit system;}; nixpkgsFor = system: import nixpkgs {inherit system;};
in { in {

8
templates/godot/flake.nix
View file

@ -7,11 +7,15 @@
... ...
}: let }: let
inherit (self) outputs; inherit (self) outputs;
systems = [ supportedSystems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
]; ];
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
in { in {
devShells = forAllSystems (system: let devShells = forAllSystems (system: let
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs {inherit system;};

13
templates/nix-flake/flake.nix
View file

@ -1,8 +1,6 @@
{ {
inputs = { inputs.pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { outputs = {
self, self,
@ -12,14 +10,15 @@
}: let }: let
inherit (self) outputs; inherit (self) outputs;
systems = [ supportedSystems = [
"aarch64-linux" "aarch64-linux"
"x86_64-linux"
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
"x86_64-linux"
]; ];
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
in { in {
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);

10
templates/rust/flake.nix
View file

@ -5,7 +5,13 @@
nixpkgs, nixpkgs,
}: let }: let
inherit (self) outputs; inherit (self) outputs;
supportedSystems = ["x86_64-linux"]; supportedSystems = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
forEachSupportedSystem = nixpkgs.lib.genAttrs supportedSystems; forEachSupportedSystem = nixpkgs.lib.genAttrs supportedSystems;
in { in {
devShells = forEachSupportedSystem (system: let devShells = forEachSupportedSystem (system: let
@ -18,6 +24,8 @@
rustfmt rustfmt
rustPackages.clippy rustPackages.clippy
rust-analyzer rust-analyzer
lldb
pkg-config
]; ];
}; };