janis/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: janis:c5df6d6bba099776709e91798e2db67fcbda2807
Branches Tags
janis:main
janis:new-config
..
compare: janis:63b98d9ea37113a117e3dea1769e995ea04355da
Branches Tags
janis:main
janis:new-config

No commits in common. "c5df6d6bba099776709e91798e2db67fcbda2807" and "63b98d9ea37113a117e3dea1769e995ea04355da" have entirely different histories.
c5df6d6bba ... 63b98d9ea3

9 changed files with 54 additions and 155 deletions
Show stats Expand all files Collapse all files

141
flake.lock
View file

@ -71,16 +71,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": "nixpkgs-stable"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1790368160, "lastModified": 1785062976,
"narHash": "sha256-q6H6pTUzi1l1k0Hql9U0l7uTSPiv4o7ywQ/bhVFYIJg=", "narHash": "sha256-3PQYC0Gm9NfAJbko6JTtFBlujtXWm7L5VZpUVJRu04c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "cd274f2c485f50cf9a0c90f36b13a923fa0e344e", "rev": "ecf4a1a2d40f5cf118e7ffa255212ffba6036151",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,27 +104,6 @@
} }
}, },
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixpak",
"nixpkgs"
]
},
"locked": {
"lastModified": 1782949081,
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nordvpn-flake", "nordvpn-flake",
@ -147,7 +124,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_3": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nur", "nur",
@ -188,32 +165,7 @@
}, },
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": "flake-parts",
"nixpak",
"flake-parts"
],
"nixpkgs": [
"nixpak",
"nixpkgs"
]
},
"locked": {
"lastModified": 1781499420,
"narHash": "sha256-vy0EiuiLRKWbXYOqdEKoy5ImlbHcdMC52x9BcC/MwQ8=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "86c7c78a840b44b1a0a5cbc7e9baa0154c0d0f3f",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"hercules-ci-effects_2": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
@ -237,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1790215976, "lastModified": 1784350909,
"narHash": "sha256-VkR1rMGyjU9jtw8ISFx5uqR9e+LEaOlhHwrseFkiIVk=", "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a6631107a83ceab5872f298a2ea710859c80c4cb", "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,28 +223,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpak": {
"inputs": {
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1785072517,
"narHash": "sha256-eh6isB4Gt3Wry1fPqRI1qKWySjDbalvaBwToG82jcR4=",
"owner": "nixpak",
"repo": "nixpak",
"rev": "333bd8c7ca0c014e61be1933b3c131c9dfa20218",
"type": "github"
},
"original": {
"owner": "nixpak",
"repo": "nixpak",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1771848320, "lastModified": 1771848320,
@ -309,13 +239,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1790185690, "lastModified": 1784856561,
"narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4975466d324710c576dc11ad614684e6bd8cad8e", "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1784796856,
"narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,11 +321,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1790218706, "lastModified": 1784856561,
"narHash": "sha256-6e4Na3z008XpdVyOXgfasXIn1aN+z8AXFG+jXdQSyuI=", "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c508844df6c28fa6dabc1b6af70f3ccbd65c5201", "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +353,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1790185690, "lastModified": 1784796856,
"narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4975466d324710c576dc11ad614684e6bd8cad8e", "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,7 +394,7 @@
"nordvpn-flake": { "nordvpn-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"hercules-ci-effects": "hercules-ci-effects_2", "hercules-ci-effects": "hercules-ci-effects",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -471,15 +417,15 @@
}, },
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1790373482, "lastModified": 1785072147,
"narHash": "sha256-YjZ8nL6rZjW8WC2AA+TrFFrrpYNg1JnipHnYS8p8gXU=", "narHash": "sha256-DSH73PfXqVWYz30Hnx1oeKQUx0w+C2cS3KpVN8BRYrw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "e36059ae679d1e362c936794b5267a4c7f75e36b", "rev": "a89983ca76709019703fec796f038a42172012ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -508,7 +454,6 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpak": "nixpak",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nordvpn-flake": "nordvpn-flake", "nordvpn-flake": "nordvpn-flake",
@ -523,11 +468,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1790321428, "lastModified": 1786507911,
"narHash": "sha256-JQBGEZDY6up5yu0ehQeDDnjvsw7MP8d4AlaBd9RxZVI=", "narHash": "sha256-w5aZRLbiu7H6TqsYXVMdRKg0S4DRaJpxyqxx86AwxVk=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "84fb3c79e477d5e7ec4eff9c24dbc5d5c99b0fd1", "rev": "39db48099ad16834af7e27485a4babf9c28b3897",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -15,7 +15,6 @@
emacs-overlay = { emacs-overlay = {
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
@ -23,17 +22,11 @@
}; };
apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git"; duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git";
nordvpn-flake = { nordvpn-flake.url = "github:janis-bhm/nordvpn-flake";
url = "github:janis-bhm/nordvpn-flake"; nordvpn-flake.inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpak = {
url = "github:nixpak/nixpak";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
}; };
outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, rust-overlay, nordvpn-flake, nixpak, ... }: outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, rust-overlay, nordvpn-flake, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
@ -72,7 +65,6 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; # Allow unfree packages globally config.allowUnfree = true; # Allow unfree packages globally
config.android_sdk.accept_license = true; # Accept Android SDK license
config.permittedInsecurePackages = [ config.permittedInsecurePackages = [
"electron-39.8.10" "electron-39.8.10"
]; ];

6
home/common.nix
View file

@ -25,10 +25,6 @@ in {
shell.enableZshIntegration = true; shell.enableZshIntegration = true;
sessionPath = [
"/home/${user.username}/.local/bin"
];
sessionVariables = { sessionVariables = {
SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";
EDITOR = "nvim"; EDITOR = "nvim";
@ -49,8 +45,6 @@ in {
yazi yazi
ranger ranger
neovim neovim
ffmpeg
whisper-cpp-vulkan
nix-index nix-index

15
home/development/android.nix
View file

@ -1,15 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
android-studio
kotlin
ktfmt
ktlint
jdk25
yaml-language-server
kotlin-language-server
pkg-config
gradle_9
];
}

10
home/development/default.nix
View file

@ -2,19 +2,9 @@
imports = [ imports = [
./nix.nix ./nix.nix
./rust.nix ./rust.nix
./android.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
unstable.opencode
ghidra-bin ghidra-bin
poppler-utils
(python3.withPackages (ps: [
ps.pypdf
ps.pdftotext
ps.pdf2image
ps.pdfplumber
]))
]; ];
} }

11
home/development/rust.nix
View file

@ -1,7 +1,6 @@
{pkgs, ...}: { {...}: {
home.packages = [ # home.packages = with pkgs; [
pkgs.unstable.rustup # ];
];
home.file.".cargo/config.toml".text = '' home.file.".cargo/config.toml".text = ''
# [unstable] # [unstable]
@ -33,9 +32,9 @@
target-dir = "/var/code/rust/.cargo/global-target" target-dir = "/var/code/rust/.cargo/global-target"
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
linker = "${pkgs.clang}/bin/clang" linker = "clang"
rustflags = [ rustflags = [
"-Clink-arg=-fuse-ld=${pkgs.mold}/bin/mold", "-Clink-arg=--ld-path=mold",
# Compile faster # Compile faster
"-Zshare-generics=y", "-Zshare-generics=y",
"-Zthreads=12", "-Zthreads=12",

7
home/emacs.nix
View file

@ -12,6 +12,7 @@ in {
# TODO: turn this into a FHS or package so these dependencies don't have to be # TODO: turn this into a FHS or package so these dependencies don't have to be
# accessible from the global namespace. # accessible from the global namespace.
home.packages = with pkgs; [ home.packages = with pkgs; [
python3
enchant2 # spell checking enchant2 # spell checking
enchant2.dev # for building jinx enchant2.dev # for building jinx
pkg-config pkg-config
@ -25,10 +26,8 @@ in {
libtool libtool
gnumake gnumake
gcc gcc
multimarkdown
texlive.combined.scheme-full texlive.combined.scheme-full
(tree-sitter.withPlugins (grammars: with grammars; [ (tree-sitter.withPlugins (grammars: with grammars; [
tree-sitter-kotlin
tree-sitter-bash tree-sitter-bash
tree-sitter-nix tree-sitter-nix
tree-sitter-toml tree-sitter-toml
@ -61,8 +60,8 @@ in {
emacs-lsp-booster emacs-lsp-booster
# language servers # language servers
nixd pkgs.unstable.rust-analyzer
]; nixd];
# xdg.configFile = { # xdg.configFile = {
# "emacs" = { # "emacs" = {

1
system/boot.nix
View file

@ -6,7 +6,6 @@
devices = [ "nodev" ]; devices = [ "nodev" ];
efiSupport = true; efiSupport = true;
useOSProber = true; useOSProber = true;
configurationLimit = 5;
}; };
# systemd-boot.enable = true; # systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;

4
system/core.nix
View file

@ -16,10 +16,6 @@
fd fd
tree tree
xdg-utils xdg-utils
patchelf
coreutils
bubblewrap
tmux
# nixos util # nixos util
nh nh