Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-24 13:45:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:8f04684b00cabc407ad480e771c3036196b9228a
Branches Tags
Nickiel:main
Nickiel:awesome-dev
..
compare: Nickiel:315dd99ba9f43f13278555f123025bc58ff11b9b
Branches Tags
Nickiel:main
Nickiel:awesome-dev

No commits in common. "8f04684b00cabc407ad480e771c3036196b9228a" and "315dd99ba9f43f13278555f123025bc58ff11b9b" have entirely different histories.
8f04684b00 ... 315dd99ba9

9 changed files with 94 additions and 148 deletions
Show stats Expand all files Collapse all files

61
flake.lock
View file

@ -62,11 +62,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1692799911,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695224363, "lastModified": 1694642908,
"narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", "narHash": "sha256-0Opzs/56VW03COlVdoBrHJZGxQ7gzLDEWADnccC8ras=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", "rev": "b62f549653e97d78392c1e282b8ca76546a86585",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1695227806, "lastModified": 1691843304,
"narHash": "sha256-EcChzeEOh2oAZNgvR+kWCBpWomMopK2Zs+0+dvDUJh0=", "narHash": "sha256-aLAMpvbQPLkpjJDUWYTYRmEclAQTo+IVzqPQYOfmxfw=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "22da3354e6f629f9294c830d8558875d77b5cffc", "rev": "a05e93c62ca2c25cc81d76d9cf36880fe0bf183a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,22 +191,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1695283060,
"narHash": "sha256-CJz71xhCLlRkdFUSQEL0pIAAfcnWFXMzd9vXhPrnrEg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "31ed632c692e6a36cfc18083b88ece892f863ed4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1685801374, "lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
@ -256,11 +240,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1695145219, "lastModified": 1694422566,
"narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +256,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1694767346, "lastModified": 1694183432,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +278,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1695300485, "lastModified": 1694341786,
"narHash": "sha256-lPxXM584q9AVdUZxbEJgIPVeg39X6GWIENuENRxyHqo=", "narHash": "sha256-7xp0lZ0Ihx1f9WLYxOWP73PlM0HOa0Wrp3/iF7D++zc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "32a64af2318beac3c89d4d1fa0b73ce237c5cf1e", "rev": "9e6892e8391a5bcc3727802b6a9fb2b9b52537df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,14 +327,14 @@
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1694364351, "lastModified": 1692274144,
"narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=", "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7", "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,7 +349,6 @@
"kmonad": "kmonad", "kmonad": "kmonad",
"nicks_nextcloud_integrations": "nicks_nextcloud_integrations", "nicks_nextcloud_integrations": "nicks_nextcloud_integrations",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim" "nixvim": "nixvim"
} }
}, },

41
flake.nix
View file

@ -4,10 +4,10 @@
inputs = { inputs = {
nixvim.url = "github:nix-community/nixvim"; nixvim.url = "github:nix-community/nixvim";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/release-23.05";
kmonad.url = "github:kmonad/kmonad?dir=nix"; kmonad.url = "github:kmonad/kmonad?dir=nix";
nicks_nextcloud_integrations.url = "git+https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git"; nicks_nextcloud_integrations.url = "git+https://git.nickiel.net/Nickiel/nicks_nextcloud_integrations.git";
# dead code?
home-manager = { home-manager = {
url = github:nix-community/home-manager; url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -16,29 +16,24 @@
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, kmonad, ... }: outputs = inputs@{ self, nixpkgs, home-manager, kmonad, ... }:
let let
user = "nixolas"; user = "nixolas";
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = {
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit inputs home-manager user kmonad; inherit inputs nixpkgs home-manager user kmonad;
# Home server # Home server
Alaska = lib.nixosSystem { Alaska = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = { inherit user; };
inherit user;
pkgs-stable = inputs.nixpkgs-stable;
};
modules = [ modules = [
inputs.nicks_nextcloud_integrations.nixosModules.default inputs.nicks_nextcloud_integrations.nixosModules.default
@ -51,13 +46,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = { inherit user; };
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)
@ -72,9 +61,7 @@
NicksNixLaptop = lib.nixosSystem { NicksNixLaptop = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = { inherit user; };
inherit user;
};
modules = [ modules = [
{ {
@ -88,13 +75,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = { inherit user; };
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)
@ -124,13 +105,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { extraSpecialArgs = { inherit user; };
inherit user;
pkgs-stable = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
};
users.${user} = { users.${user} = {
imports = [ imports = [
(import ./users/${user}.nix) (import ./users/${user}.nix)

11
hosts/configuration.nix
View file

@ -13,15 +13,6 @@
enableKwallet = true; enableKwallet = true;
}; };
# Some programs look for session variables to store config files at
# (Looking at you home-manager yazi)
environment.sessionVariables = rec {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
};
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "us"; layout = "us";
@ -93,6 +84,7 @@
steam-hardware.enable = true; steam-hardware.enable = true;
}; };
sound = { sound = {
enable = false; enable = false;
mediaKeys.enable = true; mediaKeys.enable = true;
@ -107,6 +99,7 @@
#jack.enable = true; #jack.enable = true;
}; };
# Enable CUPS to print documents. # Enable CUPS to print documents.
services.printing.enable = true; services.printing.enable = true;

12
hosts/default.nix
View file

@ -37,6 +37,18 @@ in {
../modules/zsh.nix ../modules/zsh.nix
]; ];
}; };
users.nicholix = {
imports = [
../users/nicholix.nix
../modules/emacs.nix
../modules/git.nix
../modules/fusuma.nix
../modules/vim.nix
../modules/wezterm.nix
../modules/xdg.nix
../modules/zsh.nix
]
}
}; };
} }
]; ];

38
hosts/laptop/default.nix
View file

@ -1,40 +1,44 @@
{ config, ... }: { config, ... }:
{ imports = [ {
imports = [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
networking.hosts = { networking.hosts = {
#"10.0.0.183" = [ "headscale.nickiel.net" ]; "10.0.0.183" = [ "headscale.nickiel.net" ];
"100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
"jellyfin.nickiel.net" ];
}; };
# tailscale set --exit-node <SEVERNAME> to route through an exit node # tailscale set --exit-node <SEVERNAME> to route through an exit node
services.tailscale.enable = true; networking.firewall = { services.tailscale.enable = true;
checkReversePath = "loose"; trustedInterfaces = [ "tailscale0" ]; networking.firewall = {
checkReversePath = "loose";
trustedInterfaces = [ "tailscale0" ];
allowedUDPPorts = [ config.services.tailscale.port ]; allowedUDPPorts = [ config.services.tailscale.port ];
}; };
time.hardwareClockInLocalTime = true; time.hardwareClockInLocalTime = true;
boot.loader = { efi = { boot.loader = {
canTouchEfiVariables = true; efiSysMountPoint = "/boot"; efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
}; };
grub = { grub = {
devices = [ "nodev" ]; devices = [ "nodev" ];
efiSupport = true; efiSupport = true;
enable = true; enable = true;
useOSProber = true; useOSProber = false;
# extraEntries = '' extraEntries = ''
# menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows menuentry 'Windows Boot Manager (on /dev/nvme0n1p1)' --class windows --class os $menuentry_id_option 'osprober-efi-364F-BE7A' {
# --class os $menuentry_id_option 'osprober-efi-364F-BE7A' { insmod part_gpt
# insmod part_gpt insmod fat search --no-floppy --fs-uuid insmod fat
# --set=root 364F-BE7A chainloader search --no-floppy --fs-uuid --set=root 364F-BE7A
# /efi/Microsoft/Boot/bootmgfw.efi chainloader /efi/Microsoft/Boot/bootmgfw.efi
# } }
# ''; '';
}; };
}; };

2
modules/neovim.nix
View file

@ -6,8 +6,6 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
# Required clipboard provider # Required clipboard provider
xclip xclip
# Required for find in file
ripgrep
]; ];
programs.nixvim = { programs.nixvim = {

20
modules/yazi.nix
View file

@ -1,20 +0,0 @@
{ config, lib, pkgs, home-manager, ... }:
{
programs.yazi = {
enable = true;
enableZshIntegration = true;
settings = {
manager = {
sort_by = "natural";
sort_sensitive = false;
sort_dir_first = true;
show_hidden = true;
show_symlink = true;
sort_reverse = false;
};
};
};
}

1
modules/zsh.nix
View file

@ -40,7 +40,6 @@ in
ls = "eza"; ls = "eza";
gust = "/home/nixolas/Documents/Gust/target/debug/gust"; gust = "/home/nixolas/Documents/Gust/target/debug/gust";
rm = "rmtrash"; rm = "rmtrash";
open-config = "cd ~/Documents/nicks-nix-config; nvim";
}; };
}; };

52
users/nixolas.nix
View file

@ -1,4 +1,4 @@
{ inputs, config, pkgs, pkgs-stable, user, ... }: { inputs, config, pkgs, user, ... }:
let let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz); moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
@ -21,12 +21,12 @@ in
imports = [ imports = [
../modules/discord.nix ../modules/discord.nix
#../modules/emacs.nix #../modules/emacs.nix
../modules/fusuma.nix
../modules/git.nix ../modules/git.nix
../modules/neovim.nix ../modules/neovim.nix
../modules/rofi.nix ../modules/rofi.nix
../modules/wezterm.nix ../modules/wezterm.nix
../modules/xdg.nix ../modules/xdg.nix
../modules/yazi.nix
../modules/zsh.nix ../modules/zsh.nix
]; ];
@ -78,45 +78,48 @@ in
bottom # system monitor bottom # system monitor
du-dust # directory disk-space analyzer du-dust # directory disk-space analyzer
ffmpeg-full # ffmpeg for video/audio rendering ffmpeg-full # ffmpeg for video/audio rendering
pkgs-stable.frei0r # kdenlive video plugins frei0r # kdenlive video plugins
pkgs-stable.flameshot # screenshot utility flameshot # screenshot utility
pkgs-stable.fontpreview # utility to preview fonts fontpreview # utility to preview fonts
gitui # command line git tui gitui # command line git tui
pkgs-stable.helvum # audio sink gui control helvum # audio sink gui control
pkgs-stable.pandoc # utility for converting between document types pandoc # utility for converting between document types
pkgs-stable.qmk # QMK utility for compiling qmk firmware qmk # QMK utility for compiling qmk firmware
nextcloud-client # Nextcloud private syncing nextcloud-client # Nextcloud private syncing
hddtemp hddtemp
pkgs-stable.texlive.combined.scheme-medium texlive.combined.scheme-medium
# commandline utils # commandline utils
eza eza
fd fd
fortune fortune
neofetch neofetch
pandoc
pfetch pfetch
ripgrep
rmtrash rmtrash
testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/ testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/
xdotool xdotool
pkgs-stable.vhs yazi
vhs
pkgs-stable.nodejs # required for coc-nvim nodejs # required for coc-nvim
# Gui application # Gui application
pkgs-stable.darktable # RAW processing darktable # RAW processing
pkgs-stable.dbeaver # SQL management tool dbeaver # SQL management tool
firefox # Internet access firefox # Internet access
pkgs-stable.handbrake # dvd ripping handbrake # dvd ripping
pkgs-stable.inkscape # Vector drawing inkscape # Vector drawing
pkgs-stable.kicad # PCB design kicad # PCB design
krita # Raster drawing krita # Raster drawing
pkgs-stable.libreoffice-fresh # Office editing libreoffice-fresh # Office editing
pkgs-stable.makemkv # blue-ray + dvd -> mkv makemkv # blue-ray + dvd -> mkv
pkgs-stable.obsidian # Markdown and notes obsidian # Markdown and notes
qalculate-gtk # unit-friendly calculator qalculate-gtk # unit-friendly calculator
pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough vscodium # when vim and emacs (somehow) isn't enough
pkgs-stable.dragon # simple audio player dragon # simple audio player
obs-studio # for video recording and virtual camera obs-studio # for video recording and virtual camera
libsForQt5.kate # kate/kwrite libsForQt5.kate # kate/kwrite
@ -126,9 +129,9 @@ in
libsForQt5.soundkonverter # audio cd ripping libsForQt5.soundkonverter # audio cd ripping
# Kdenlive and deps # Kdenlive and deps
pkgs-stable.libsForQt5.kdenlive libsForQt5.kdenlive
pkgs-stable.mediainfo mediainfo
pkgs-stable.mlt mlt
# Drawing tablet driver # Drawing tablet driver
opentabletdriver opentabletdriver
@ -136,7 +139,6 @@ in
sessionVariables = { sessionVariables = {
NIX_SHELL_PRESERVE_PROMPT = 1; NIX_SHELL_PRESERVE_PROMPT = 1;
EDITOR = "nvim";
}; };
}; };