disable mongo, update System Version to 23.11
Change-Id: Iedf8bba405afbc6b5008463e006bdbecb4294707
Reviewed-on: https://git.clicks.codes/c/Coded/nixConfig/+/96
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Samuel Shuert <coded@clicks.codes>
diff --git a/.gitreview b/.gitreview
index 8e686c3..e2ab699 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
[gerrit]
host=ssh.clicks.codes
port=29418
-project=Coded/NixFiles
+project=Coded/nixConfig.git
defaultBranch=main
diff --git a/flake.lock b/flake.lock
index 303f290..52957ad 100755
--- a/flake.lock
+++ b/flake.lock
@@ -262,16 +262,16 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1698134075,
- "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=",
+ "lastModified": 1701389149,
+ "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4",
+ "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
diff --git a/flake.nix b/flake.nix
index 45541f7..da68f66 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
description = "Initialization flake";
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
alacritty-themes.url = "github:rajasegar/alacritty-themes";
@@ -22,7 +22,10 @@
inputs.lanzaboote.nixosModules.lanzaboote
{
nix.settings.experimental-features = [ "nix-command" "flakes" ];
- system.stateVersion = "23.05";
+ system.stateVersion = "23.11";
+ nixpkgs.config.permittedInsecurePackages = [
+ "mailspring-1.12.0"
+ ];
}
] ++ (nixpkgs.lib.pipe ./modules [
(import ./utils/nixFilesIn.nix nixpkgs.lib)
diff --git a/modules/audio.nix b/modules/audio.nix
index 14f2167..4046f2b 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -1,16 +1,34 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, inputs, ... }: {
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
+
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
+ jack.enable = true;
};
+ environment.etc."pipewire/pipewire.conf.d/VirtualAudioDevice.conf".text = ''
+ context.objects = [
+ {
+ factory = adapter
+ args = {
+ factory.name = support.null-audio-sink
+ node.name = Microphone-Proxy
+ node.description = Microphone
+ media.class = Audio/Source/Virtual
+ audio.posistion = MONO
+ }
+ }
+ ]
+ '';
+
home-manager.users.coded.home.packages =
with pkgs; [
+ audacity
helvum
lmms
];
diff --git a/modules/mongo.nix b/modules/mongo.nix
index bb17552..e42b184 100644
--- a/modules/mongo.nix
+++ b/modules/mongo.nix
@@ -1,5 +1,5 @@
{ config, pkgs, ... }: {
environment.systemPackages = [ pkgs.mongosh pkgs.mongodb-tools ];
- services.mongodb.enable = true;
+ services.mongodb.enable = false;
services.mongodb.package = pkgs.mongodb-6_0;
}
diff --git a/modules/networking.nix b/modules/networking.nix
index c04cf72..05997db 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -4,10 +4,11 @@
networkmanager.enable = true;
hosts = {
+ "192.168.0.1" = [ "a1" ];
+ "192.168.0.2" = [ "a1d1" ];
"192.168.0.4" = [ "CodedPi" ];
- "192.168.0.5" = [ "SamuelDesktop" ];
+ "192.168.0.5" = [ "SamuelDesktop" "codedPC" "me" ];
"192.168.0.6" = [ "a1d2" ];
- "localhost:5000" = [ "ollama" ];
};
firewall = {
diff --git a/modules/printing.nix b/modules/printing.nix
new file mode 100644
index 0000000..2c22100
--- /dev/null
+++ b/modules/printing.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+ environment.systemPackages = with pkgs; [
+ cura
+ printrun
+ ];
+}
diff --git a/modules/shell.nix b/modules/shell.nix
index 6d66e7b..2deaa16 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -2,6 +2,11 @@
programs.zsh.enable = true;
users.users.coded.shell = pkgs.zsh;
+ environment.systemPackages = with pkgs; [
+ bmon
+ wget
+ ];
+
home-manager.users.coded.programs = {
# ZSH
zsh = {
@@ -16,6 +21,8 @@
"gr!" = "git review";
clr = "clear";
pnpx = "pnpm dlx";
+ print3d = "sudo /run/current-system/sw/bin/pronsole.py";
+ nh = "wget -O ~/Documents/hashCheck $1 | nix hash file ~/Documents/hashCheck";
};
dirHashes = { code = "$HOME/Documents/programming"; };
@@ -28,7 +35,7 @@
plugins = [ "git" ];
};
};
-
+
# Starship
starship = {
enable = true;
@@ -49,38 +56,6 @@
};
};
- # htop
- # htop = {
- # enable = true;
- # settings = {
- # color_scheme = 6;
- # cpu_count_from_one = 0;
- # delay = 15;
- # fields = with home-manager.config.lib.htop.fields; [
- # PID
- # USER
- # PERCENT_CPU
- # PERCENT_MEM
- # M_SIZE
- # M_RESIDENT
- # M_SHARE
- # STATE
- # TIME
- # COMM
- # ];
- # } // (with home-manager.config.lib.htop; leftMeters [
- # (bar "AllCPUs2")
- # (bar "Memory")
- # (bar "Swap")
- # (text "Zram")
- # ]) // (with home-manager.config.lib.htop; rightMeters [
- # (text "Tasks")
- # (text "LoadAverage")
- # (text "Uptime")
- # (text "Systemd")
- # ]);
- # };
-
# Nix-index
nix-index.enable = true;
diff --git a/modules/vscode.nix b/modules/vscode.nix
index 2cb2d3d..7ca0c59 100644
--- a/modules/vscode.nix
+++ b/modules/vscode.nix
@@ -1,6 +1,19 @@
{ pkgs, nix-vscode-extensions, ... }: {
home-manager.users.coded.programs.vscode = {
enable = true;
+ enableUpdateCheck = false;
+ userSettings = {
+ "files.autoSave" = "afterDelay";
+ "explorer.confirmDelete" = false;
+ "workbench.iconTheme" = "helium-icon-theme";
+ "workbench.colorTheme" = "One Dark Pro";
+ "terminal.integrated.defaultProfile.linux" = "zsh";
+ "workbench.startupEditor" = "none";
+ "explorer.confirmDragAndDrop" = false;
+ "typescript.updateImportsOnFileMove.enabled" = "always";
+ "javascript.updateImportsOnFileMove.enabled" = "always";
+ "terminal.integrated.enableMultiLinePasteWarning" = false;
+ };
extensions = with pkgs.vscode-extensions;
[
ms-vsliveshare.vsliveshare