Compare commits

..

No commits in common. "37d83dd90fec2961307aea4a08568534e5d2d90a" and "c00ca43565964a8ad85785481d9fe4c2642e06f3" have entirely different histories.

6 changed files with 21 additions and 102 deletions

View file

@ -84,10 +84,8 @@ cmp.setup({
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
local lspconfig = require('lspconfig') vim.lsp.enable("rust_analyzer")
local servers = { "rust_analyzer", "pylsp", "biome", "eslint", "ccls" } vim.lsp.enable("pylsp")
for _, lsp in ipairs(servers) do vim.lsp.enable("biome")
lspconfig[lsp].setup({ vim.lsp.enable("eslint")
capabilities = capabilities, vim.lsp.enable("ccls")
})
end

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, pkgs-stable, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
@ -88,62 +88,7 @@
]; ];
# Firejail # Firejail
programs.firejail = { # TODO: add this back
enable = true;
wrappedBinaries = {
vesktop = {
executable = "${pkgs-stable.vesktop}/bin/vesktop";
profile = "${pkgs.firejail}/etc/firejail/vesktop.profile";
extraArgs = [
"--ignore=dbus-system"
"--ignore=nodbus"
"--dbus-user.talk=org.freedesktop.Notifications"
"--dbus-user.talk=org.kde.StatusNotifierWatcher"
"--dbus-user.talk=org.freedesktop.portal.Desktop"
"--dbus-user.talk=org.freedesktop.portal.ScreenCast"
"--dbus-user.talk=org.freedesktop.portal.Documents"
"--noblacklist=/run/user/[0-9]*/discord-ipc-*"
"--whitelist=/run/user/[0-9]*/discord-ipc-*"
"--env=GTK_THEME=Adwaita:dark"
"--noblacklist=~/Pictures"
"--noblacklist=~/Documents"
"--whitelist=~/Pictures"
"--whitelist=~/Documents"
];
};
firefox = {
executable = "${pkgs.firefox}/bin/firefox";
profile = "${pkgs.firejail}/etc/firejail/firefox.profile";
extraArgs = [
"--env=GTK_THEME=Adwaita:dark"
];
};
signal-desktop-bin = {
executable = "${pkgs.signal-desktop-bin}/bin/signal-desktop";
profile = "${pkgs.firejail}/etc/firejail/signal-desktop.profile";
extraArgs = [
"--env=GTK_THEME=Adwaita:dark"
"--noblacklist=~/Pictures"
"--noblacklist=~/Documents"
"--whitelist=~/Pictures"
"--whitelist=~/Documents"
"--dbus-user.talk=org.freedesktop.Notifications"
"--dbus-user.talk=org.kde.StatusNotifierWatcher"
];
};
obsidian = {
executable = "${pkgs.obsidian}/bin/obsidian";
profile = "${pkgs.firejail}/etc/firejail/obsidian.profile";
extraArgs = [
"--env=GTK_THEME=Adwaita:dark"
];
};
};
};
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
# I keep this enabled even if I main Hyprland because of QT. # I keep this enabled even if I main Hyprland because of QT.

37
flake.lock generated
View file

@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1767437240, "lastModified": 1761266473,
"narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=", "narHash": "sha256-QxCyKWBmuzI+eMhYV1JmbZsiUnBNATRP1EW34OBt5Vg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012", "rev": "5c71d4a730bd3c972befff343bb074421e345937",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1767185284, "lastModified": 1762463231,
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,11 +72,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767379071, "lastModified": 1761114652,
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fb7944c166a3b630f177938e478f0378e64ce108", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,30 +86,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1767325753,
"narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-stable": "nixpkgs-stable"
} }
} }
}, },

View file

@ -4,7 +4,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable/";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/"; nixos-hardware.url = "github:NixOS/nixos-hardware/";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
@ -17,7 +16,7 @@
}; };
outputs = outputs =
{ self, nixpkgs, nixpkgs-stable, home-manager, impermanence, disko, ... } @ inputs: { self, nixpkgs, home-manager, impermanence, disko, ... } @ inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
username = "xory"; username = "xory";
@ -27,13 +26,7 @@
mkNixosHost = hostName: mkNixosHost = hostName:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = { inherit inputs; };
inherit inputs;
pkgs-stable = import nixpkgs-stable {
system = "x86_64-linux";
config.allowUnfree = true;
};
};
modules = [ modules = [
{ nixpkgs.overlays = [ opentrack-overlay ]; } { nixpkgs.overlays = [ opentrack-overlay ]; }

View file

@ -22,7 +22,7 @@
rocmPackages.clr.icd rocmPackages.clr.icd
]; ];
services.ollama.package = pkgs.ollama-rocm; services.ollama.acceleration = "rocm";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
framework-tool framework-tool

View file

@ -24,5 +24,5 @@
}; };
boot.blacklistedKernelModules = [ "nouveau" ]; boot.blacklistedKernelModules = [ "nouveau" ];
services.ollama.package = pkgs.ollama-cuda; services.ollama.acceleration = "cuda";
} }