Compare commits

..

4 Commits

Author SHA1 Message Date
d7ceb1e7be fix: neovide 2024-05-24 12:45:13 +02:00
1b330bddc1 fix: neovide, nvim 2024-05-24 12:32:41 +02:00
a43b7764d4 update system 2024-05-24 12:22:28 +02:00
f0d3715fb2 refactor: change system config 2024-05-24 11:59:43 +02:00
7 changed files with 77 additions and 102 deletions

108
flake.lock generated
View File

@@ -102,11 +102,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714641030, "lastModified": 1715865404,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -115,6 +115,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-root": {
"locked": {
"lastModified": 1713493429,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
"owner": "srid",
"repo": "flake-root",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "flake-root",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@@ -133,24 +148,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -180,11 +177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714679908, "lastModified": 1716457508,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -201,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714679908, "lastModified": 1716448020,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=", "narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848", "rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713946171, "lastModified": 1716329735,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -273,11 +270,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714635257, "lastModified": 1716330097,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -292,19 +289,21 @@
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-root": "flake-root",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1714730761, "lastModified": 1716501867,
"narHash": "sha256-TjxlzjUl+wf3xw1+NKJSMZ/yWO+HE7X8aP1Qey77R2o=", "narHash": "sha256-4ytMzHH3E3TTBnNv7w+v0JH+nln0kgAR8ODIC7oPuZk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c05fba47c733445098847399b61ddfd81ecbde55", "rev": "56aaef010ad9afae1730337e8ce71060fbcaa542",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -315,11 +314,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1714822436, "lastModified": 1716543979,
"narHash": "sha256-QnWfY6LlKBi5asOFaAe86A1rejF2LFzIRCzWZUUZvMc=", "narHash": "sha256-uGp1xBxjPL2ACagXOkazhYtE4WujXwXUI6nKiXrlEZ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "33f7913ac4b94015e465b9be78f90c5df6bfa498", "rev": "8d56a7c71dd362321002041a704978e3dc23e51f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -331,7 +330,6 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@@ -343,11 +341,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714478972, "lastModified": 1716213921,
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2849da033884f54822af194400f8dff435ada242", "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -396,18 +394,24 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1715940852,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
} }

View File

@@ -28,12 +28,10 @@
loader = { loader = {
systemd-boot = { systemd-boot = {
enable = true; enable = true;
editor = false;
configurationLimit = 10; configurationLimit = 10;
}; };
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
supportedFilesystems = [ "ntfs" ];
}; };
xdg.forced-compliance.enable = true; xdg.forced-compliance.enable = true;
@@ -141,30 +139,6 @@
enable = true; enable = true;
plugins = with pkgs; [ networkmanager-openconnect ]; plugins = with pkgs; [ networkmanager-openconnect ];
}; };
hosts = {
"192.168.0.219" = [ "kookaborrow" ];
"192.168.0.1" = [ "router" ];
};
};
fileSystems."/mnt/media" = {
device = "kookaborrow:/media";
fsType = "nfs";
options = [
"x-systemd-automount"
"noauto"
];
};
fileSystems."/run/media/theaninova/heart-drive" = {
device = "/dev/sdb2";
fsType = "ntfs";
};
fileSystems."/run/media/theaninova/windows" = {
device = "/dev/sda2";
fsType = "ntfs";
}; };
system.stateVersion = "24.05"; system.stateVersion = "24.05";

View File

@@ -1,5 +1,24 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.neovide ]; home.packages = [ pkgs.neovide ];
xdg.configFile."neovide/config.toml".source = ./neovide.toml; xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" {
maximized = false;
fork = true;
font = {
normal = [ "FiraCode Nerd Font" ];
size = 13;
edging = "subpixelantialias";
features."FiraCode Nerd Font" = [
"+zero"
"+onum"
"+ss04"
"+cv19"
"+cv23"
"+ss09"
"+ss06"
"+ss07"
"+ss10"
];
};
};
} }

View File

@@ -1,20 +0,0 @@
maximized = false
srgb = true
[font]
normal = ["FiraCode Nerd Font"]
size = 16
edging = "subpixelantialias"
[font.features]
"FiraCode Nerd Font" = [
"+zero",
"+onum",
"+ss04",
"+cv19",
"+cv23",
"+ss09",
"+ss06",
"+ss07",
"+ss10",
]

View File

@@ -420,7 +420,6 @@
]; ];
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
vim-mergetool vim-mergetool
rest-nvim
plenary-nvim plenary-nvim
actions-preview-nvim actions-preview-nvim
]; ];

View File

@@ -1,5 +1,4 @@
require("cmp-npm").setup({}) require("cmp-npm").setup({})
require("rest-nvim").setup({})
require("actions-preview").setup({}) require("actions-preview").setup({})
if vim.g.neovide then if vim.g.neovide then

View File

@@ -14,7 +14,7 @@ in
boot = { boot = {
loader.timeout = 0; loader.timeout = 0;
plymouth.enable = true; # plymouth.enable = true;
kernelParams = [ kernelParams = [
"quiet" "quiet"