larstvei/nix-config
1
0
Fork 0
mirror of https://github.com/larstvei/nix-config.git synced 2025-06-07 20:00:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: larstvei:504227c44c71711bee4abafc6ddff0877b9024f9
Branches Tags
larstvei:main
larstvei:nixos
..
compare: larstvei:733a94450778233a649a42834005097abbbff3ad
Branches Tags
larstvei:main
larstvei:nixos

No commits in common. "504227c44c71711bee4abafc6ddff0877b9024f9" and "733a94450778233a649a42834005097abbbff3ad" have entirely different histories.
504227c44c ... 733a944507

6 changed files with 77 additions and 49 deletions
Show Stats Expand all files Collapse all files

106
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739034224, "lastModified": 1727507295,
"narHash": "sha256-Mj/8jDzh1KNmUhWqEeVlW3hO9MZkxqioJGnmR7rivaE=", "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0b6f96a6b9efcfa8d3cc8023008bcbcd1b9bc1a4", "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"emacs-config": { "emacs-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737496996, "lastModified": 1725551480,
"narHash": "sha256-fKIiUGiVrNVQbIf+TH3w/kp801wyRacRtc1lSWtbz9g=", "narHash": "sha256-NP2qZrT799JCny+8MKWSL6gdJGr1BxAoo9QOaNWo9UM=",
"owner": "larstvei", "owner": "larstvei",
"repo": "dot-emacs", "repo": "dot-emacs",
"rev": "5a78a0fce4139bfe6bfab54411f3ac9f105af442", "rev": "32cbab47f8020cde616f16f0f0590612b637f2a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,15 +41,15 @@
"emacs-config": "emacs-config", "emacs-config": "emacs-config",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"emacs-plus": "emacs-plus", "emacs-plus": "emacs-plus",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1739064992, "lastModified": 1726969086,
"narHash": "sha256-N3kUr/yiBelJq+3O2VjnuhONVagnXsZS3WqQkG7StCY=", "narHash": "sha256-CHKX91NOuVOiVQPzxNNZJLxi+bD/ACbTbbTGOplieGE=",
"owner": "larstvei", "owner": "larstvei",
"repo": "emacs-flake", "repo": "emacs-flake",
"rev": "17c2621d57bd4e5d24e6836c48533dcdccc941f2", "rev": "678b51e6607341da055ad471de66c319536aada7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,15 +60,16 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1739063922, "lastModified": 1726967971,
"narHash": "sha256-kChq3WS1NDpGnIpuTrcVKggZ0CUJbUlMBRkmJYWMMcw=", "narHash": "sha256-UO0TQbj8UFI4tioDTjmui0UqTL8CZkwizolvxqJLGu0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ce509b25a8d65cebd8ee5722423151690b4e5e70", "rev": "2c5171a36fcd616753b204c34ef38bf7729825e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +81,11 @@
"emacs-plus": { "emacs-plus": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734881694, "lastModified": 1726592256,
"narHash": "sha256-0awwiJjYGvwzqghzjgQiE6rRyv//I68l2ivwdstbBfU=", "narHash": "sha256-Twamd/Doh2btEix3TK/NfilT5eZ6jEJ9rBXbJeVb6Yw=",
"owner": "d12frosted", "owner": "d12frosted",
"repo": "homebrew-emacs-plus", "repo": "homebrew-emacs-plus",
"rev": "5f1f625f43d498dcb9a931e0f351bfdaeb41cd1b", "rev": "cc3280dfdf7562dd69c97d0dfa872b1c3313a18a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +99,29 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1726560853,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +137,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739051380, "lastModified": 1727383923,
"narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +152,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739020877, "lastModified": 1726755586,
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,27 +168,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1738843498, "lastModified": 1726838390,
"narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1739019272, "lastModified": 1726871744,
"narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=", "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec", "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,17 +200,17 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1737110817, "lastModified": 1727492312,
"narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", "narHash": "sha256-oRkgc+DosM3HIl9el98TxF2rtliKHCNVw00nlQC7xYM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", "rev": "4471f9f67fe0f95f5fec4cc2ebac59fe32af2b62",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c",
"type": "github" "type": "github"
} }
}, },
@ -217,6 +236,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
flake.nix
View File

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/041c867bad68dfe34b78b2813028a2e2ea70a23c"; url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
darwin = { darwin = {
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";

1
modules/fonts.nix
View File

@ -1,7 +1,6 @@
{ pkgs }: { pkgs }:
with pkgs; with pkgs;
[ [
iosevka
source-sans source-sans
source-code-pro source-code-pro
source-serif source-serif

3
modules/languages.nix
View File

@ -69,11 +69,10 @@ with pkgs;
rust = [ rust = [
cargo cargo
rustc rustc
rustfmt
rust-analyzer rust-analyzer
]; ];
tex = [ tex = [
texliveFull texlive.combined.scheme-full
]; ];
} }

4
modules/macos.nix
View File

@ -56,6 +56,10 @@
upgrade = true; upgrade = true;
cleanup = "uninstall"; cleanup = "uninstall";
}; };
taps = [
"homebrew/cask"
"homebrew/cask-versions"
];
casks = [ casks = [
"amethyst" "amethyst"
"arc" "arc"

10
modules/tools.nix
View File

@ -10,10 +10,6 @@ with pkgs;
(hunspellWithDicts [ hunspellDicts.nb_NO ]) (hunspellWithDicts [ hunspellDicts.nb_NO ])
]; ];
# terminal = [
# ghostty
# ];
modernReplacements = [ modernReplacements = [
bat bat
fd fd
@ -21,11 +17,11 @@ with pkgs;
]; ];
utils = [ utils = [
cloc
jet jet
jq jq
pandoc pandoc
parallel parallel
tokei
wget wget
]; ];
@ -38,8 +34,4 @@ with pkgs;
poppler_utils poppler_utils
]; ];
academic = [
zotero
];
} }