noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-04-25 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: noah:1e9401eef236461d482bce96f1723a7b0cb7d6bc
Branches Tags
noah:master
noah:platform
noah:home-manager-fix
noah:immich-proxy
noah:microcode
noah:nixd
noah:eblume-mole
noah:language-checks
noah:keyd-2.4.3
noah:sway
noah:nixosmodules
noah:unfree-predicate-by-pkgs
noah:darwin-ssl
noah:pre-platform
noah:begin-nixos
noah:begin-nix
noah:neovim-lua
noah:pre-nix
noah:legacy
..
compare: noah:275863795317f8ce65486b138c1fb4eb6dbd65f8
Branches Tags
noah:master
noah:platform
noah:home-manager-fix
noah:immich-proxy
noah:microcode
noah:nixd
noah:eblume-mole
noah:language-checks
noah:keyd-2.4.3
noah:sway
noah:nixosmodules
noah:unfree-predicate-by-pkgs
noah:darwin-ssl
noah:pre-platform
noah:begin-nixos
noah:begin-nix
noah:neovim-lua
noah:pre-nix
noah:legacy

No commits in common. "1e9401eef236461d482bce96f1723a7b0cb7d6bc" and "275863795317f8ce65486b138c1fb4eb6dbd65f8" have entirely different histories.
1e9401eef2 ... 2758637953

6 changed files with 76 additions and 88 deletions
Show Stats Expand all files Collapse all files

28
disks/root.nix
View File

@ -4,30 +4,38 @@
type = "disk"; type = "disk";
device = disk; device = disk;
content = { content = {
type = "gpt"; type = "table";
partitions = { format = "gpt";
partitions = [
# Boot partition # Boot partition
ESP = { {
size = "512MiB"; name = "ESP";
type = "EF00"; start = "0";
end = "512MiB";
fs-type = "fat32";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "vfat";
mountpoint = "/boot"; mountpoint = "/boot";
extraArgs = [ "-n boot" ]; extraArgs = [ "-n boot" ];
}; };
}; }
# Root partition ext4 # Root partition ext4
root = { {
size = "100%"; name = "root";
start = "512MiB";
end = "100%";
part-type = "primary";
bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "ext4"; format = "ext4";
mountpoint = "/"; mountpoint = "/";
extraArgs = [ "-L nixos" ]; extraArgs = [ "-L nixos" ];
}; };
}; }
}; ];
}; };
}; };
}; };

127
flake.lock generated
View File

@ -16,22 +16,6 @@
"type": "github" "type": "github"
} }
}, },
"base16-nvim-src": {
"flake": false,
"locked": {
"lastModified": 1708139024,
"narHash": "sha256-l0BO2boIy6mwK8ISWS3D68f8egqHYwsGSAnzjbB5aOE=",
"owner": "RRethy",
"repo": "base16-nvim",
"rev": "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a",
"type": "github"
},
"original": {
"owner": "RRethy",
"repo": "base16-nvim",
"type": "github"
}
},
"bufferline-nvim-src": { "bufferline-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -52,11 +36,11 @@
"bypass-paywalls-clean": { "bypass-paywalls-clean": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707730831, "lastModified": 1707683475,
"narHash": "sha256-Ina+gCIHTtLLvGem88ec8rBaRwO1M+mDVSgjk/MM5wM=", "narHash": "sha256-FhAwgDV+4lrtvjoX0DfjFxFuXx76xAl1QnVSqzqkkzI=",
"owner": "magnolia1234", "owner": "magnolia1234",
"repo": "bpc-uploads", "repo": "bpc-uploads",
"rev": "47c602fb1253ff05b3654da4a6d375978f6a43fd", "rev": "5013f74a9be9a4329c597b39a69cb4e1e8d6c544",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -105,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708231718, "lastModified": 1706833576,
"narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +110,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708221730, "lastModified": 1707524024,
"narHash": "sha256-vyx6tsnDGX4bNegiF1kREHMRDH7hy+q1m56V8JYHWLI=", "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d8a4377cd8eec23668ea3fae07efee9d5782cb91", "rev": "d07de570ba05cec2807d058daaa044f6955720c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708217014, "lastModified": 1707612259,
"narHash": "sha256-ujI9daLmnmigZtdMsVeqVouAYFoYWKrrZ7FvGMzdVzs=", "narHash": "sha256-oZgnpwtpcvjRaRF++IdEWvQUV3PU6bEAyUYv8gAGZbQ=",
"owner": "bandithedoge", "owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin", "repo": "nixpkgs-firefox-darwin",
"rev": "2ab9b39e98497584ba952cacb8dfadf8492fd28d", "rev": "121995525d845657b2fea5d7a2b93f0f28540b43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +235,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708031129, "lastModified": 1707683400,
"narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -268,11 +252,11 @@
"kitty-scrollback-nvim-src": { "kitty-scrollback-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707831543, "lastModified": 1707528426,
"narHash": "sha256-RAqRIrKKaRoBVLTlI18hCHvGwUb/YVfIb3soNmyO24w=", "narHash": "sha256-avtAG7BR63V1V2eT6S8BmFmgtfhtJw9440lpQUhEILg=",
"owner": "mikesmithgh", "owner": "mikesmithgh",
"repo": "kitty-scrollback.nvim", "repo": "kitty-scrollback.nvim",
"rev": "78dd609368aa20bd6fbd801cce73ea30787ebe21", "rev": "f9605398313077553433754adea1ed486107cdfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,7 +307,7 @@
"nextcloud-snappymail": { "nextcloud-snappymail": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1705809286, "lastModified": 1707509765,
"narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=", "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
"type": "tarball", "type": "tarball",
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz" "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
@ -341,11 +325,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707832982, "lastModified": 1707399750,
"narHash": "sha256-Jsrj8HJyo+PmjrHIDhq4gjZCE0eYCVmmTrx24cG8eOQ=", "narHash": "sha256-rDYGILM+qW9xvRALPsMKwWouFB7vwnDj0GTeRIkGdDM=",
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"repo": "nix2vim", "repo": "nix2vim",
"rev": "2fb1328cf058fc967b02f9a5330a99253b4c247e", "rev": "813ca68c6f8d287ced56efd7bc442dcc0cd1c9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +361,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707873059, "lastModified": 1707405218,
"narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -392,11 +376,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708118438, "lastModified": 1707546158,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +392,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1708261229, "lastModified": 1707684252,
"narHash": "sha256-mC9gMz4E7Dm9nvCE6oqNMmZLMdoJ3Pjik2oqEZDVrgU=", "narHash": "sha256-uIxfAPm/qsK1KSBVe3HwSGVHziTcgYY67WXSmYIDvNU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "c4296c55625e5394c142d5c07c00cddb76d5241b", "rev": "73479b37282accecfc7f3f91e56a0b709f104ad2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -424,11 +408,11 @@
"nvim-lint-src": { "nvim-lint-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708102077, "lastModified": 1707389610,
"narHash": "sha256-dWjST8OnPZbDG3Ih3VA53vq4QX6RJeJ0PJj82lqfOVg=", "narHash": "sha256-o2XCMJOySY7A40yS8/aFqhOSpPWTleD4DnOMssSKmXc=",
"owner": "mfussenegger", "owner": "mfussenegger",
"repo": "nvim-lint", "repo": "nvim-lint",
"rev": "31be66c27214174a28fc092ffcf4bb3e8f6cfd43", "rev": "966ab3dc37eee3e413692264b44a3011b05a6060",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +441,11 @@
"nvim-tree-lua-src": { "nvim-tree-lua-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708237704, "lastModified": 1707632320,
"narHash": "sha256-Yi1bf24CcKNllJ6lm/BERJEkoFYDUDQGGjHlEDgaOiU=", "narHash": "sha256-hZ6YMrVGZRYfdbsULSz4MEn7D8y9g3CtzuxTBseTuck=",
"owner": "kyazdani42", "owner": "kyazdani42",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "d35a8d5ec6358ada4b058431b367b32360737466", "rev": "4a87b8b46b4a30107971871df3cb7f4c30fdd5d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +457,11 @@
"nvim-treesitter-src": { "nvim-treesitter-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1708261405, "lastModified": 1707658579,
"narHash": "sha256-jOlJA/ZJgPj3Yg62ryKUbseGQ0CPGJDdyoDyO34fXhg=", "narHash": "sha256-inzHbLYMyGfr1d5HUv7jd/DyjeM7GSUxQmtxuU4t/Ew=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "5e4b657181516e4aaf03ccbb4b21eca3b62b07dc", "rev": "b52b298669f0813bbfbc12d07280c9e2f6f17ebc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -535,7 +519,6 @@
"root": { "root": {
"inputs": { "inputs": {
"baleia-nvim-src": "baleia-nvim-src", "baleia-nvim-src": "baleia-nvim-src",
"base16-nvim-src": "base16-nvim-src",
"bufferline-nvim-src": "bufferline-nvim-src", "bufferline-nvim-src": "bufferline-nvim-src",
"bypass-paywalls-clean": "bypass-paywalls-clean", "bypass-paywalls-clean": "bypass-paywalls-clean",
"cmp-nvim-lsp-src": "cmp-nvim-lsp-src", "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
@ -660,11 +643,11 @@
"tree-sitter-bash": { "tree-sitter-bash": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707951703, "lastModified": 1707605310,
"narHash": "sha256-SU5wBy81aANd7oUZvYR14Vd53Ml/cBSwDtO6uG34CaE=", "narHash": "sha256-bUOwR1m0tBA0mI8/zOxa44nuTK6LICE7gINIk+a/ov0=",
"owner": "tree-sitter", "owner": "tree-sitter",
"repo": "tree-sitter-bash", "repo": "tree-sitter-bash",
"rev": "975bc70ad95dbbf2733872bc2e0a059c055db983", "rev": "1c6ebd1ae1d4afb140df094b2ac443a52bf7ff95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -726,11 +709,11 @@
"tree-sitter-python": { "tree-sitter-python": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707954801, "lastModified": 1700218345,
"narHash": "sha256-K3zamqQPM1UHk375TrMvT9mXw8f7tUse5bFctI+V1EA=", "narHash": "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0=",
"owner": "tree-sitter", "owner": "tree-sitter",
"repo": "tree-sitter-python", "repo": "tree-sitter-python",
"rev": "deba2badc88afd18e6cbd4341ee3c18c3a9bb4ed", "rev": "4bfdd9033a2225cc95032ce77066b7aeca9e2efc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +726,11 @@
"tree-sitter-rasi": { "tree-sitter-rasi": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707776004, "lastModified": 1678701563,
"narHash": "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=", "narHash": "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=",
"owner": "Fymyte", "owner": "Fymyte",
"repo": "tree-sitter-rasi", "repo": "tree-sitter-rasi",
"rev": "43196d934a9a6ab3c7093a8683efd0111bb03db1", "rev": "371dac6bcce0df5566c1cfebde69d90ecbeefd2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -797,11 +780,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707761607, "lastModified": 1707476384,
"narHash": "sha256-OKNdTgnyhZpmqdgba8s78/QvowyTIMJDp0iLxv570bU=", "narHash": "sha256-9YortZTCO9r7wFHX92t+npUDmD5VcKrkVmwaPCvEiXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "c8ddba82ca6b791be1acaae4b336ff8e857ec70b", "rev": "76ca59d8d4423b27c0238bc31401692ebc571365",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -813,11 +796,11 @@
"zenyd-mpv-scripts": { "zenyd-mpv-scripts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1707704915, "lastModified": 1706283438,
"narHash": "sha256-9P/8q/OZXfaJMS08acQP4h3/zUA5mKRQee0JmkXcz1w=", "narHash": "sha256-hpLZDtt5q18aZ8d9LHfT852wtBosKUTJ7Bx+cbjBLcg=",
"owner": "zenyd", "owner": "zenyd",
"repo": "mpv-scripts", "repo": "mpv-scripts",
"rev": "9bdce0050144cb24f92475f7bdd77180e0e4c26b", "rev": "7100d19d18d111ce77fc9e6e8947c0d542a86397",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -60,10 +60,6 @@
}; };
# Neovim plugins # Neovim plugins
base16-nvim-src = {
url = "github:RRethy/base16-nvim";
flake = false;
};
nvim-lspconfig-src = { nvim-lspconfig-src = {
# https://github.com/neovim/nvim-lspconfig/tags # https://github.com/neovim/nvim-lspconfig/tags
url = "github:neovim/nvim-lspconfig/v0.1.7"; url = "github:neovim/nvim-lspconfig/v0.1.7";

2
modules/common/mail/himalaya.nix
View File

@ -9,6 +9,8 @@
programs.himalaya = { enable = true; }; programs.himalaya = { enable = true; };
accounts.email.accounts.home.himalaya = { accounts.email.accounts.home.himalaya = {
enable = true; enable = true;
backend = "imap";
sender = "smtp";
settings = { settings = {
downloads-dir = config.userDirs.download; downloads-dir = config.userDirs.download;
smtp-insecure = true; smtp-insecure = true;

2
modules/common/neovim/config/colors.nix
View File

@ -8,7 +8,7 @@
}; };
config = { config = {
plugins = [ pkgs.vimPlugins.base16-nvim ]; plugins = [ pkgs.vimPlugins.nvim-base16 ];
setup.base16-colorscheme = config.colors; setup.base16-colorscheme = config.colors;
# Telescope isn't working, shut off for now # Telescope isn't working, shut off for now

1
overlays/neovim-plugins.nix
View File

@ -38,7 +38,6 @@ in {
nvim-lint = withSrc prev.vimPlugins.nvim-lint inputs.nvim-lint-src; nvim-lint = withSrc prev.vimPlugins.nvim-lint inputs.nvim-lint-src;
# Packaging plugins entirely with Nix # Packaging plugins entirely with Nix
base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src; baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src; hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin { kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin {