Compare commits

..

7 Commits

10 changed files with 63 additions and 43 deletions
+6 -30
View File
@@ -31,40 +31,16 @@
{ ... }@inputs: { ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import inputs.nixpkgs { #pkgs = import inputs.nixpkgs {
inherit system; # inherit system;
config.allowUnfree = true; #};
};
hostName = "january"; hostName = "january";
userName = "autumn";
in in
{ {
nixosConfigurations.${hostName} = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations.${hostName} = inputs.nixpkgs.lib.nixosSystem {
inherit system; specialArgs = { inherit inputs; inherit hostName; };
inherit pkgs; modules = [ ./nixos/configuration.nix ];
specialArgs = {
inherit hostName;
};
modules = [
./nixos/configuration.nix
inputs.home-manager.nixosModules.home-manager
{
home-manager.backupFileExtension = "hm-bak";
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.sharedModules = [
inputs.nixvim.homeModules.nixvim
inputs.stylix.homeModules.stylix
inputs.zen-browser.homeModules.default
];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."autumn" = ./home-manager/home.nix;
}
];
}; };
}; };
} }
+10 -1
View File
@@ -1,6 +1,10 @@
{ pkgs, ... }: { inputs, pkgs, ... }:
{ {
imports = [ imports = [
inputs.nixvim.homeModules.nixvim
inputs.stylix.homeModules.stylix
inputs.zen-browser.homeModules.default
./programs ./programs
./clangd.nix ./clangd.nix
@@ -14,6 +18,11 @@
home.homeDirectory = "/home/autumn"; home.homeDirectory = "/home/autumn";
home.stateVersion = "25.05"; home.stateVersion = "25.05";
nixpkgs.config = {
allowUnfree = true;
allowUnfreePredicate = _: true;
};
home.pointerCursor = { home.pointerCursor = {
name = "Adwaita"; name = "Adwaita";
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
+6
View File
@@ -78,6 +78,7 @@
} }
monitor = DP-2, 2560x1440@180, 0x0, 1#, bitdepth, 10, cm, hdr monitor = DP-2, 2560x1440@180, 0x0, 1#, bitdepth, 10, cm, hdr
#monitor = DP-2, 1920x1080@180, 0x0, 1#, bitdepth, 10, cm, hdr
monitor = HDMI-A-1, 1920x1080@60, 2560x0, 1 monitor = HDMI-A-1, 1920x1080@60, 2560x0, 1
bind=$mainMod, Q, exec, $terminal bind=$mainMod, Q, exec, $terminal
@@ -131,13 +132,18 @@
bind=$mainMod, mouse_up, workspace, e-1 bind=$mainMod, mouse_up, workspace, e-1
bindm=$mainMod, mouse:272, movewindow bindm=$mainMod, mouse:272, movewindow
bindm=$mainMod, mouse:273, resizewindow bindm=$mainMod, mouse:273, resizewindow
env=XCURSOR_SIZE,24 env=XCURSOR_SIZE,24
env=HYPRCURSOR_SIZE,24 env=HYPRCURSOR_SIZE,24
exec-once=swww-daemon exec-once=swww-daemon
exec=swww img ${config.stylix.image} exec=swww img ${config.stylix.image}
exec-once=waybar exec-once=waybar
exec=pkill waybar; waybar exec=pkill waybar; waybar
windowrulev2=suppressevent maximize, class:.* windowrulev2=suppressevent maximize, class:.*
#windowrulev2 = opacity 0.9, class:(com.mitchellh.ghostty) #windowrulev2 = opacity 0.9, class:(com.mitchellh.ghostty)
layerrule = noanim, selection
''; '';
} }
+6
View File
@@ -4,6 +4,7 @@
anki anki
arduino-ide arduino-ide
audacity audacity
bitwarden-desktop
blender blender
cava cava
cmus cmus
@@ -16,6 +17,8 @@
git git
ghidra-bin ghidra-bin
grim grim
imagemagick
jellycli
jugglinglab jugglinglab
kdePackages.kdenlive kdePackages.kdenlive
kicad kicad
@@ -24,11 +27,14 @@
lazygit lazygit
ldtk ldtk
libresprite libresprite
live-server
localsend
logisim-evolution logisim-evolution
lunar-client lunar-client
man-pages man-pages
man-pages-posix man-pages-posix
musikcube musikcube
nextcloud-client
obs-studio obs-studio
pandoc pandoc
python3 python3
+10 -9
View File
@@ -6,21 +6,18 @@
inlayHints = true; inlayHints = true;
servers = { servers = {
asm_lsp.enable = true; asm_lsp.enable = true;
lua_ls = {
enable = true;
settings.telemetry.enable = false;
};
pyright.enable = true;
mlir_lsp_server.enable = true;
nixd.enable = true;
nil_ls.enable = true;
clangd = { clangd = {
enable = true; enable = true;
cmd = [ cmd = [
"clangd" "clangd"
]; ];
}; };
cssls.enable = true;
eslint.enable = true; eslint.enable = true;
lua_ls = {
enable = true;
settings.telemetry.enable = false;
};
hls = { hls = {
enable = true; enable = true;
installGhc = true; installGhc = true;
@@ -30,8 +27,12 @@
}; };
html.enable = true; html.enable = true;
jsonls.enable = true; jsonls.enable = true;
ocamllsp.enable = true; mlir_lsp_server.enable = true;
nil_ls.enable = true;
nixd.enable = true;
nushell.enable = true; nushell.enable = true;
ocamllsp.enable = true;
pyright.enable = true;
ts_ls.enable = true; ts_ls.enable = true;
zls.enable = true; zls.enable = true;
}; };
@@ -1,8 +1,8 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./codesnap.nix ./codesnap.nix
./emmet.nix
./rustaceanvim.nix ./rustaceanvim.nix
./telescope.nix ./telescope.nix
./toggleterm.nix ./toggleterm.nix
@@ -24,6 +24,7 @@
quickmath.enable = true; quickmath.enable = true;
render-markdown.enable = true; render-markdown.enable = true;
treesj.enable = true; treesj.enable = true;
ts-autotag.enable = true;
visual-multi.enable = true; visual-multi.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
yazi.enable = true; yazi.enable = true;
@@ -0,0 +1,8 @@
{ ... }:
{
programs.nixvim.plugins.emmet = {
enable = true;
settings.leader = "<C-Y>";
settings.mode = "a";
};
}
+1
View File
@@ -5,6 +5,7 @@
with config.stylix.fonts; with config.stylix.fonts;
'' ''
@import url('https://refact0r.github.io/midnight-discord/build/midnight.css'); @import url('https://refact0r.github.io/midnight-discord/build/midnight.css');
@import url('https://gitea.thekittycat.ca/autumn-the-kitty-cat/no-nitro/raw/branch/main/no-nitro.css');
body { body {
font-family: '${monospace.name}', '${emoji.name}'; font-family: '${monospace.name}', '${emoji.name}';
+1 -1
View File
@@ -132,7 +132,7 @@
} }
#workspaces button.active { #workspaces button.active {
color: #${config.stylix.base16Scheme.palette.base0E}; color: #${config.stylix.base16Scheme.palette.base0D};
} }
''; '';
}; };
+13 -1
View File
@@ -1,20 +1,25 @@
{ pkgs, hostName, ... }: { inputs, hostName, pkgs, ... }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.home-manager
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
nix.package = pkgs.lixPackageSets.latest.lix;
networking.hostName = "${hostName}"; networking.hostName = "${hostName}";
hardware.graphics.enable = true; hardware.graphics.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
nixpkgs.config.allowUnfree = true;
time.timeZone = "America/Toronto"; time.timeZone = "America/Toronto";
i18n.defaultLocale = "en_CA.UTF-8"; i18n.defaultLocale = "en_CA.UTF-8";
@@ -24,6 +29,13 @@
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl" KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
''; '';
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
autumn = import ../home-manager/home.nix;
};
};
services.gnome.glib-networking.enable = true; services.gnome.glib-networking.enable = true;
programs.hyprland = { programs.hyprland = {