patching for migration to 25.05
This commit is contained in:
parent
4ef7c58661
commit
eca476ac8d
9 changed files with 670 additions and 384 deletions
|
|
@ -1,8 +1,4 @@
|
||||||
# NixOS Config
|
# NixOS Config
|
||||||
My personal NixOS Configuration Repository
|
My personal NixOS Configuration Repository
|
||||||
|
|
||||||
This Nix flake defines NixOS configurations for two machines: creatorforge-vm and creatorforge-framework. The flake imports various external repositories to provide additional functionality, such as Home Manager, sops-nix, and disko.
|
|
||||||
|
|
||||||
Here is an overview of the flake:
|
|
||||||
|
|
||||||
[](https://builtwithnix.org)
|
[](https://builtwithnix.org)
|
||||||
|
|
|
||||||
830
flake.lock
generated
830
flake.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -2,18 +2,14 @@
|
||||||
description = "Nixos config flake";
|
description = "Nixos config flake";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-23.11";
|
url = "github:nix-community/home-manager/release-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
xremap.url = "github:xremap/nix-flake";
|
xremap.url = "github:xremap/nix-flake";
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
disko = {
|
|
||||||
url = "github:nix-community/disko";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, ... }@inputs: {
|
outputs = { self, nixpkgs, ... }@inputs: {
|
||||||
|
|
|
||||||
BIN
hosts/.katana.nix.swp
Normal file
BIN
hosts/.katana.nix.swp
Normal file
Binary file not shown.
|
|
@ -6,7 +6,6 @@
|
||||||
hardware = {
|
hardware = {
|
||||||
enableRedistributableFirmware = lib.mkDefault true;
|
enableRedistributableFirmware = lib.mkDefault true;
|
||||||
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
pulseaudio.enable = false;
|
|
||||||
bluetooth = {
|
bluetooth = {
|
||||||
enable = true; # enables support for Bluetooth
|
enable = true; # enables support for Bluetooth
|
||||||
powerOnBoot = true; # powers up the default Bluetooth controller on boot
|
powerOnBoot = true; # powers up the default Bluetooth controller on boot
|
||||||
|
|
@ -34,18 +33,21 @@
|
||||||
readOnlyNixStore = true;
|
readOnlyNixStore = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems = {
|
fileSystems."/" = {
|
||||||
"/" = {
|
device = "UUID=7a97edd8-c5a9-4354-a461-24c0f311e61b";
|
||||||
device = "/dev/disk/by-uuid/55c746b3-b9dc-4c9b-ab56-de68a561f9a3";
|
fsType = "ext4";
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
"/boot" = {
|
|
||||||
device = "/dev/disk/by-uuid/0C59-9996";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ ];
|
fileSystems."/boot" = {
|
||||||
|
device = "UUID=F0BD-FE72";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "UUID=e107d78d-d934-4939-889d-1860410321d5";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
# Networking
|
# Networking
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -58,8 +60,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Sound
|
|
||||||
sound.enable = true;
|
|
||||||
|
|
||||||
# Localization
|
# Localization
|
||||||
time.timeZone = "America/Detroit";
|
time.timeZone = "America/Detroit";
|
||||||
|
|
@ -81,10 +81,13 @@
|
||||||
# Services.
|
# Services.
|
||||||
services = {
|
services = {
|
||||||
blueman.enable = true;
|
blueman.enable = true;
|
||||||
|
pulseaudio.enable = false;
|
||||||
printing.enable = true;
|
printing.enable = true;
|
||||||
xserver = {
|
xserver = {
|
||||||
layout = "us";
|
xkb = {
|
||||||
xkbVariant = "";
|
layout = "us";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -100,8 +103,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
# Sets flakes to unstable track instead of stable #
|
|
||||||
package = pkgs.nixUnstable; # or versioned attributes like nix_2_4
|
|
||||||
# Enable flakes and nix-command
|
# Enable flakes and nix-command
|
||||||
extraOptions = ''experimental-features = nix-command flakes'';
|
extraOptions = ''experimental-features = nix-command flakes'';
|
||||||
# Auto maintainence
|
# Auto maintainence
|
||||||
|
|
@ -136,13 +137,12 @@
|
||||||
bottom
|
bottom
|
||||||
felix-fm
|
felix-fm
|
||||||
zulip
|
zulip
|
||||||
vscode
|
|
||||||
discord
|
discord
|
||||||
obsidian
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Fonts
|
# Fonts
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = [
|
||||||
(nerdfonts.override { fonts = [ "SourceCodePro" "DroidSansMono" ]; })
|
pkgs.nerd-fonts.droid-sans-mono
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,146 +0,0 @@
|
||||||
{ pkgs, config, lib, ...}:
|
|
||||||
{
|
|
||||||
options.speccon18.hm.helix.enable = lib.mkEnableOption "enables specs custom helix configuration";
|
|
||||||
config = lib.mkIf config.speccon18.hm.helix.enable {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
nodePackages_latest.yaml-language-server
|
|
||||||
nodePackages_latest.bash-language-server
|
|
||||||
nodePackages_latest.vscode-langservers-extracted
|
|
||||||
nodePackages_latest.dockerfile-language-server-nodejs
|
|
||||||
nodePackages_latest.typescript
|
|
||||||
nodePackages_latest.typescript-language-server
|
|
||||||
nodePackages_latest.svelte-language-server
|
|
||||||
nodePackages_latest.vls
|
|
||||||
python311Packages.python-lsp-server
|
|
||||||
# rnix-lsp is archived need to update to fix CVE-2024-27297
|
|
||||||
rust-analyzer
|
|
||||||
taplo
|
|
||||||
];
|
|
||||||
programs.helix = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
theme = "monokai_pro_octagon";
|
|
||||||
editor = {
|
|
||||||
line-number = "relative";
|
|
||||||
shell = ["zsh" "-c"];
|
|
||||||
completion-trigger-len = 0;
|
|
||||||
scroll-lines = 1;
|
|
||||||
scrolloff = 5;
|
|
||||||
cursorline = true;
|
|
||||||
cursor-shape = {
|
|
||||||
normal = "block";
|
|
||||||
insert = "bar";
|
|
||||||
select = "underline";
|
|
||||||
};
|
|
||||||
color-modes = true;
|
|
||||||
indent-guides.render = true;
|
|
||||||
file-picker.hidden = false;
|
|
||||||
auto-pairs = true;
|
|
||||||
lsp = {
|
|
||||||
enable = true;
|
|
||||||
display-messages = true;
|
|
||||||
auto-signature-help = true;
|
|
||||||
display-signature-help-docs = true;
|
|
||||||
snippets = true;
|
|
||||||
goto-reference-include-declaration = true;
|
|
||||||
};
|
|
||||||
statusline = {
|
|
||||||
mode = {
|
|
||||||
normal = "NORMAL";
|
|
||||||
insert = "INSERT";
|
|
||||||
select = "SELECT";
|
|
||||||
};
|
|
||||||
left = [ "mode" "separator" "spinner" "separator" "file-name" ];
|
|
||||||
right = [ "diagnostics" "position" "file-encoding" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
themes = {
|
|
||||||
monokai_pro_octagon = let
|
|
||||||
red = "#ff657a";
|
|
||||||
orange = "#ff9b5e";
|
|
||||||
yellow = "#ffd76d";
|
|
||||||
green = "#bad761";
|
|
||||||
blue = "#9cd1bb";
|
|
||||||
purple = "#c39ac9";
|
|
||||||
base0 = "#161821";
|
|
||||||
base1 = "#1e1f2b";
|
|
||||||
base2 = "#282a3a";
|
|
||||||
base3 = "#3a3d4b";
|
|
||||||
base4 = "#535763";
|
|
||||||
base5 = "#696d77";
|
|
||||||
base6 = "#767b81";
|
|
||||||
base7 = "#b2b9bd";
|
|
||||||
base8 = "#eaf2f1";
|
|
||||||
base8x0c = "#303342";
|
|
||||||
in {
|
|
||||||
"ui.linenr.selected" = { bg = base3; };
|
|
||||||
"ui.text.focus" = { fg = yellow; modifiers = ["bold"]; };
|
|
||||||
"ui.menu" = { fg = base8; bg = base3; };
|
|
||||||
"ui.menu.selected" = { fg = base2; bg = yellow; };
|
|
||||||
"ui.virtual.whitespace" = base5;
|
|
||||||
"ui.virtual.ruler" = { bg = base1; };
|
|
||||||
"info" = base8;
|
|
||||||
"hint" = base8;
|
|
||||||
"ui.background" = {};
|
|
||||||
"ui.statusline.inactive" = { fg = base8; bg = base8x0c; };
|
|
||||||
"ui.statusline" = { fg = base8; bg = base4; };
|
|
||||||
"ui.statusline.normal" = { fg = base4; bg = blue; };
|
|
||||||
"ui.statusline.insert" = { fg = base4; bg = green; };
|
|
||||||
"ui.statusline.select" = { fg = base4; bg = purple; };
|
|
||||||
"ui.popup" = { bg = base3; };
|
|
||||||
"ui.window" = { bg = base3; };
|
|
||||||
"ui.help" = { fg = base8; bg = base3; };
|
|
||||||
"ui.selection" = { bg = base4; };
|
|
||||||
"ui.cursor.match" = { bg = base4; };
|
|
||||||
"ui.cursorline" = { bg = base1; };
|
|
||||||
"comment" = { fg = base5; modifiers = ["italic"]; };
|
|
||||||
"ui.linenr" = { fg = base5; };
|
|
||||||
"ui.cursor.primary" = { fg = base7; modifiers = ["reversed"]; };
|
|
||||||
"attribute" = blue;
|
|
||||||
"variable" = base8;
|
|
||||||
"constant" = orange;
|
|
||||||
"variable.builtin" = red;
|
|
||||||
"constant.builtin" = red;
|
|
||||||
"namespace" = base8;
|
|
||||||
"ui.text" = { fg = base8; };
|
|
||||||
"punctuation" = base6;
|
|
||||||
"type" = green;
|
|
||||||
"type.builtin" = { fg = red; };
|
|
||||||
"label" = base8;
|
|
||||||
"constructor" = blue;
|
|
||||||
"function" = green;
|
|
||||||
"function.macro" = { fg = blue; };
|
|
||||||
"function.builtin" = { fg = "cyan"; };
|
|
||||||
"operator" = red;
|
|
||||||
"variable.other.member" = base8;
|
|
||||||
"keyword" = { fg = red; };
|
|
||||||
"keyword.directive" = blue;
|
|
||||||
"variable.parameter" = "#f59762";
|
|
||||||
"error" = red;
|
|
||||||
"special" = "#f59762";
|
|
||||||
"module" = "#f59762";
|
|
||||||
"warning" = "orange";
|
|
||||||
"constant.character.escape" = { fg = base8; };
|
|
||||||
"string" = yellow;
|
|
||||||
"constant.numeric" = purple;
|
|
||||||
"diff.plus" = green;
|
|
||||||
"diff.delta" = "orange";
|
|
||||||
"diff.minus" = red;
|
|
||||||
"diagnostic.warning" = { underline = { color = "orange"; style = "curl"; }; };
|
|
||||||
"diagnostic.error" = { underline = { color = red; style = "curl"; }; };
|
|
||||||
"diagnostic.info" = { underline = { color = base8; style = "curl"; }; };
|
|
||||||
"diagnostic.hint" = { underline = { color = base8; style = "curl"; }; };
|
|
||||||
"markup.heading" = green;
|
|
||||||
"markup.bold" = { fg = "orange"; modifiers = ["bold"]; };
|
|
||||||
"markup.italic" = { fg = "orange"; modifiers = ["italic"]; };
|
|
||||||
"markup.strikethrough" = { modifiers = ["crossed_out"]; };
|
|
||||||
"markup.link.url" = { fg = "orange"; modifiers = ["underlined"]; };
|
|
||||||
"markup.link.text" = yellow;
|
|
||||||
"markup.quote" = green;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./direnv.nix
|
./direnv.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./helix.nix
|
|
||||||
./ncspot.nix
|
./ncspot.nix
|
||||||
./starship.nix
|
./starship.nix
|
||||||
./syncthing.nix
|
./syncthing.nix
|
||||||
|
|
@ -16,7 +15,6 @@
|
||||||
speccon18.hm.alacritty.enable = true;
|
speccon18.hm.alacritty.enable = true;
|
||||||
speccon18.hm.direnv.enable = true;
|
speccon18.hm.direnv.enable = true;
|
||||||
speccon18.hm.git.enable = true;
|
speccon18.hm.git.enable = true;
|
||||||
speccon18.hm.helix.enable = true;
|
|
||||||
speccon18.hm.ncspot.enable = false;
|
speccon18.hm.ncspot.enable = false;
|
||||||
speccon18.hm.starship.enable = true;
|
speccon18.hm.starship.enable = true;
|
||||||
speccon18.hm.syncthing.enable = true;
|
speccon18.hm.syncthing.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
path = "$ZDOTDIR/.zsh_history";
|
path = "$ZDOTDIR/.zsh_history";
|
||||||
save = 10000000;
|
save = 10000000;
|
||||||
};
|
};
|
||||||
enableAutosuggestions = lib.mkDefault true;
|
autosuggestion.enable = lib.mkDefault true;
|
||||||
enableCompletion = lib.mkDefault true;
|
enableCompletion = lib.mkDefault true;
|
||||||
syntaxHighlighting.enable = lib.mkDefault true;
|
syntaxHighlighting.enable = lib.mkDefault true;
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
|
|
|
||||||
20
search_string.sh
Executable file
20
search_string.sh
Executable file
|
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Check for correct number of arguments
|
||||||
|
if [ "$#" -ne 2 ]; then
|
||||||
|
echo "Usage: $0 <directory> <search_string>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
directory="$1"
|
||||||
|
search_string="$2"
|
||||||
|
|
||||||
|
# Check if the provided directory exists
|
||||||
|
if [ ! -d "$directory" ]; then
|
||||||
|
echo "Error: Directory '$directory' does not exist."
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Recursively search all files in the directory for the search string
|
||||||
|
grep -rnw "$directory" -e "$search_string"
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue