Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 24 additions & 69 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";

DankMaterialShell = {
url = "github:AvengeMedia/DankMaterialShell";

inputs.nixpkgs.follows = "nixpkgs";
inputs.quickshell.follows = "quickshell";
};

home-manager = {
url = "github:nix-community/home-manager";

Expand All @@ -26,12 +19,6 @@
url = "github:nix-community/nixos-facter-modules";
};

quickshell = {
url = "github:quickshell-mirror/quickshell";

inputs.nixpkgs.follows = "nixpkgs";
};

stylix = {
url = "github:nix-community/stylix";

Expand Down
22 changes: 7 additions & 15 deletions modules/home-manager/my/programs/dms/config.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
inputs,
config,
lib,
pkgs,
Expand All @@ -9,13 +8,6 @@ let
cfg = config.my.programs.dms;
fmt = pkgs.formats.json { };

inputDms = inputs.DankMaterialShell;
inputQs = inputs.quickshell;
system = pkgs.stdenv.hostPlatform.system;

dms-shell = inputDms.packages.${system}.dms-shell;
quickshell = inputQs.packages.${system}.default;

# DankMaterialShell's `wallpaperFillMode` option requires sentence casing
toSentenceCase = string: let
head = lib.substring 0 1 string;
Expand All @@ -28,10 +20,10 @@ in {
#
# see: https://github.com/AvengeMedia/DankMaterialShell/blob/master/nix/default.nix
config = lib.mkIf cfg.enable {
home.packages = [
pkgs.dgop
home.packages = with pkgs; [
dgop
dms-shell
] ++ (with pkgs; [

# Needed for brightness functionality
brightnessctl

Expand All @@ -47,7 +39,7 @@ in {

# Needed for soundlets
kdePackages.qtmultimedia
]);
];

# Set some values for Stylix
my.programs.dms = lib.mkIf config.stylix.enable {
Expand All @@ -73,10 +65,10 @@ in {

programs.quickshell = {
enable = true;
package = quickshell;
package = pkgs.quickshell;

configs = {
dms = "${dms-shell}/share/quickshell/dms";
dms = "${pkgs.dms-shell}/share/quickshell/dms";
};
};

Expand All @@ -103,7 +95,7 @@ in {
"--dereference --no-preserve=all " +
"${config.xdg.configHome}/DankMaterialShell/default-settings.json " +
"${config.xdg.configHome}/DankMaterialShell/settings.json";
ExecStart = "${lib.getExe dms-shell} run --session";
ExecStart = "${lib.getExe pkgs.dms-shell} run --session";
Restart = "on-failure";
};

Expand Down
4 changes: 2 additions & 2 deletions modules/nixos/my/programs/powertop/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
pciutils,
zlib,

xorg,
xset,
}:

stdenv.mkDerivation {
Expand Down Expand Up @@ -69,7 +69,7 @@ stdenv.mkDerivation {

postPatch = ''
substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe"
substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}"
substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xset}"
substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool"
'';
}
28 changes: 23 additions & 5 deletions modules/nixos/networking/networkmanager/module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,29 @@ let
cfg = config.networking.networkmanager;
in {
config = lib.mkIf cfg.enable {
my.persist.directories = [{
# TODO: better to persist `system-connections` directory only?
path = "/etc/NetworkManager";
unique = false;
}];
my.persist.directories = [
{
# TODO: better to persist `system-connections` directory only?
path = "/etc/NetworkManager";
unique = false;
}
{
# Due to NixOS hardening the `wpa_supplicant` daemon by default,
# the daemon can no longer arbitrarily read files on the filesystem.
#
# This has affected my certificates, which are imperatively stored and
# configured on a network-basis. To counter this, NixOS exposes the
# `/etc/wpa_supplicant` directory, which is where certificates should
# go, with the daemon being configured to read this directory.
#
# Files placed in the aforementioned directory must also be owned by
# the `wpa_supplicant` user and group of the same name.
#
# see: https://github.com/NixOS/nixpkgs/pull/427528
path = "/etc/wpa_supplicant";
unique = false;
}
];

# Enables broadband support, but I don't need this.
networking.modemmanager.enable = lib.mkForce false;
Expand Down
1 change: 1 addition & 0 deletions pkgs/nix-benchmark/nix/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation {
nixVersions.nix_2_30
nixVersions.nix_2_31
nixVersions.nix_2_32
nixVersions.nix_2_33
nixVersions.git
lixPackageSets.lix_2_93.lix
lixPackageSets.lix_2_94.lix
Expand Down
19 changes: 12 additions & 7 deletions users/frontear/home/programs/neovim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,19 @@
nvim-treesitter.withAllGrammars
];

# Automatically enable treesitter for all languages that are supported.
#
# see: https://github.com/nvim-treesitter/nvim-treesitter/issues/8031#issuecomment-3120353040
config = ''
require("nvim-treesitter").setup({
highlight = {
enable = true,
},
indent = {
enable = true,
},
vim.api.nvim_create_autocmd("FileType", {
callback = function(args)
local filetype = vim.bo[args.buf].filetype
local lang = vim.treesitter.language.get_lang(filetype)

if lang and vim.treesitter.language.add(lang) then
vim.treesitter.start()
end
end,
})
'';
}
Expand Down
1 change: 1 addition & 0 deletions users/frontear/home/programs/vscode/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
ms-vscode.cmake-tools
ms-vscode.cpptools
myriad-dreamin.tinymist
redhat.java
rust-lang.rust-analyzer
]);

Expand Down
Loading