tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

nixbook: update, tweaks

Browse source
This commit is contained in:
tristan 2024-10-28 12:24:31 +00:00
parent 5df2f606da
commit 62d9f9ef41
11 changed files with 182 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

226
flake.lock generated
View file

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722113426, "lastModified": 1728330715,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1727826117,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +226,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726745158, "lastModified": 1729104314,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,31 +278,10 @@
"type": "github" "type": "github"
} }
}, },
"home-manager": { "hm-cosmic": {
"inputs": { "inputs": {
"nixpkgs": [ "home-manager": "home-manager",
"nixpkgs" "home-manager-cosmic": "home-manager-cosmic"
]
},
"locked": {
"lastModified": 1727346017,
"narHash": "sha256-z7OCFXXxIseJhEHiCkkUOkYxD9jtLU8Kf5Q9WC0SjJ8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c124568e1054a62c20fbe036155cc99237633327",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-cosmic": {
"inputs": {
"home-manager": "home-manager_2",
"home-manager-cosmic": "home-manager-cosmic_2"
}, },
"locked": { "locked": {
"lastModified": 1729637091, "lastModified": 1729637091,
@ -319,7 +298,26 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-cosmic_2": { "home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1729551526,
"narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5ec753a1fc4454df9285d8b3ec0809234defb975",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-cosmic": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
@ -340,14 +338,16 @@
}, },
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1729551526, "lastModified": 1729894599,
"narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726985855, "lastModified": 1729894599,
"narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", "narHash": "sha256-nL9nzNE5/re/P+zOv7NX6bRm5e+DeS1HIufQUJ01w20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", "rev": "93435d27d250fa986bfec6b2ff263161ff8288cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,6 +399,34 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729544999,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.5",
"repo": "ixx",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -407,11 +435,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727003835, "lastModified": 1729826725,
"narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", "narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", "rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,18 +451,16 @@
"nixos-cosmic": { "nixos-cosmic": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": "nixpkgs_3",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727314564, "lastModified": 1729906530,
"narHash": "sha256-UE98O6EQYUiDp7rypkBfJG0XSz0c5FxkslyP+7Gskt8=", "narHash": "sha256-9hZQO3Ll2tP2Jw+msNuHg+Sa4l7aqJ0TMjx5DH3fUZQ=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "f2aa34f521da1d6335301fc1b58dde8ed779d632", "rev": "ba83685fb3f4422dfcf3c01a0b3a9dc4b803714d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,11 +487,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1727129439, "lastModified": 1729691686,
"narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +503,26 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1725762081, "lastModified": 1729691686,
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.05",
"type": "indirect"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1729357638,
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,26 +550,27 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1727122398, "lastModified": 1729665710,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1725534445, "lastModified": 1729265718,
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,11 +611,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727328717, "lastModified": 1729945956,
"narHash": "sha256-tGEVv5mFs38m6+60fNKlZn/6ucoOotfwn9FikXiYSlk=", "narHash": "sha256-nWRynowHjpRsDK6uf+VE6fz7/Wk80uRiAV2NQssGBH8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2ab8751b8be55accb78ca0ca58f1f4ff387001d7", "rev": "2ef948ed8ccf3c93f8caafa93cddca85df5783e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,17 +627,18 @@
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1726995581, "lastModified": 1729809697,
"narHash": "sha256-lgsE/CTkZk9OIiFGEIrxXZQ7Feiv41dqlN7pEfTdgew=", "narHash": "sha256-r3jMdRyG1ozydtmaze2Ah4OL81Y7567kbWvvME8Js/Q=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "3b7dd61b365ca45380707453758a45f2e9977be3", "rev": "b35c0b1cbbcc42161c07c77419c2801d461f1401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -606,10 +649,14 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "hm-cosmic": "hm-cosmic",
"home-manager-cosmic": "home-manager-cosmic", "home-manager": "home-manager_2",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_3", "nixpkgs": [
"nixos-cosmic",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix"
@ -623,11 +670,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727231386, "lastModified": 1729823394,
"narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,14 +686,14 @@
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1729931925,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-3tjYImjVzsSM4sU+wTySF94Yop1spI/XomMBEpljKvQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "b2211d1a537136cc1d0d5c0af391e8712016b34e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +719,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1727355527, "lastModified": 1729963473,
"narHash": "sha256-qFSPHeImI00fBzGTA94D66HMD+fJDkuz04WHp2Sg8eA=", "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "993fcabd83d1e0ee5ea038b87041593cc73c1ebe", "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -734,16 +781,17 @@
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1665001328, "lastModified": 1716423189,
"narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", "rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github" "type": "github"
} }
}, },
@ -771,11 +819,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726734507, "lastModified": 1729613947,
"narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", "narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", "rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View file

@ -1,17 +1,19 @@
{ {
description = "A flake using my config"; description = "A flake using my config";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable"; # nixpkgs.url = "nixpkgs/nixos-unstable";
nixpkgs.follows = "nixos-cosmic/nixpkgs";
nixpkgs-stable.url = "nixpkgs/nixos-24.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-cosmic.url = "github:tristanbeedell/hm-cosmic/master"; hm-cosmic.url = "github:tristanbeedell/hm-cosmic/master";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nixos-cosmic = { nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic"; url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";

1
home/default.nix
View file

@ -37,7 +37,6 @@
yt-dlp yt-dlp
fastfetch fastfetch
tree tree
ansible
ytfzf ytfzf
]; ];

3
home/desktop/cosmic/default.nix
View file

@ -21,6 +21,8 @@ in {
Super.Shift. "l" = Actions.Move "Right"; Super.Shift. "l" = Actions.Move "Right";
Super.Shift. "j" = Actions.Move "Down"; Super.Shift. "j" = Actions.Move "Down";
Super.Shift. "k" = Actions.Move "Up"; Super.Shift. "k" = Actions.Move "Up";
Super.Shift. "Right" = Actions.MoveToNextWorkspace;
Super.Shift. "Left" = Actions.MoveToPreviousWorkspace;
Super. "1" = Actions.Workspace 1; Super. "1" = Actions.Workspace 1;
Super. "2" = Actions.Workspace 2; Super. "2" = Actions.Workspace 2;
Super. "3" = Actions.Workspace 3; Super. "3" = Actions.Workspace 3;
@ -81,6 +83,7 @@ in {
focus_follows_cursor = true; focus_follows_cursor = true;
focus_follows_cursor_delay = 0; focus_follows_cursor_delay = 0;
cursor_follows_focus = true; cursor_follows_focus = true;
descale_xwayland = true;
workspaces = { workspaces = {
workspace_layout = "Horizontal"; workspace_layout = "Horizontal";
}; };

1
home/programs/git.nix
View file

@ -8,6 +8,7 @@
enable = true; enable = true;
extraConfig = { extraConfig = {
rerere.enabled = true; rerere.enabled = true;
rebase.updateRefs = true;
}; };
aliases = { aliases = {
ui = "!lazygit"; ui = "!lazygit";

3
home/workstation.nix
View file

@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
lib, lib,
stable-pkgs,
... ...
}: { }: {
imports = [ imports = [
@ -28,7 +29,7 @@
playerctl playerctl
quickemu quickemu
devenv devenv
logseq stable-pkgs.logseq
]; ];
services.udiskie = { services.udiskie = {

9
lib/mkconf.nix
View file

@ -9,9 +9,15 @@
home-modules ? [], home-modules ? [],
}: let }: let
inherit (inputs) home-manager nixpkgs sops-nix nixvim; inherit (inputs) home-manager nixpkgs sops-nix nixvim;
stable-pkgs = import inputs.nixpkgs-stable {
inherit system;
config.permittedInsecurePackages = [
"electron-27.3.11"
];
};
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs stable-pkgs;};
inherit system; inherit system;
@ -25,6 +31,7 @@ in
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
backupFileExtension = "bak"; backupFileExtension = "bak";
extraSpecialArgs = {inherit stable-pkgs;};
users.${user}.imports = users.${user}.imports =
home-modules home-modules
++ [ ++ [

27
lib/nixvim.nix
View file

@ -10,6 +10,10 @@
${cmd} ${cmd}
end''; end'';
in { in {
colorschemes.base16 = {
enable = true;
colorscheme = "gruvbox-dark-hard";
};
globals = { globals = {
mapleader = " "; mapleader = " ";
}; };
@ -21,10 +25,10 @@ in {
expandtab = true; expandtab = true;
smartindent = true; smartindent = true;
scrolloff = 4; scrolloff = 4;
smoothscroll = true;
undofile = true; undofile = true;
undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")''; undodir = lua ''vim.fn.expand("$HOME/.local/share/nvim/undo")'';
list = true; list = true;
listchars = builtins.concatStringsSep "," [ listchars = builtins.concatStringsSep "," [
"tab: >" "tab: >"
@ -36,7 +40,10 @@ in {
foldlevel = 2; foldlevel = 2;
}; };
extraPlugins = [(pkgs.vimPlugins.actions-preview-nvim)]; extraPlugins = [
(pkgs.vimPlugins.actions-preview-nvim)
(pkgs.vimPlugins.vimwiki)
];
extraConfigLua = '' extraConfigLua = ''
require("actions-preview").setup { require("actions-preview").setup {
highlight_command = { highlight_command = {
@ -214,7 +221,7 @@ in {
autoCmd = [ autoCmd = [
{ {
event = "BufWritePre"; event = "BufWritePre";
pattern = "*"; pattern = "*.go";
# https://github.com/golang/tools/blob/master/gopls/doc/vim.md#imports-and-formatting # https://github.com/golang/tools/blob/master/gopls/doc/vim.md#imports-and-formatting
callback = luaFunc '' callback = luaFunc ''
local params = vim.lsp.util.make_range_params() local params = vim.lsp.util.make_range_params()
@ -269,7 +276,7 @@ in {
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
ts-ls.enable = true; ts_ls.enable = true;
nixd = { nixd = {
enable = true; enable = true;
settings = { settings = {
@ -281,6 +288,7 @@ in {
}; };
yamlls.enable = true; yamlls.enable = true;
gopls.enable = true; gopls.enable = true;
ansiblels.enable = true;
}; };
keymaps = { keymaps = {
lspBuf = { lspBuf = {
@ -375,7 +383,16 @@ in {
}; };
}; };
oil.enable = true; oil = {
enable = true;
settings = {
keymaps = {
"<C-r>" = "actions.refresh";
"zh" = "actions.toggle_hidden";
};
view_options.show_hidden = true;
};
};
ts-autotag.enable = true; ts-autotag.enable = true;
guess-indent.enable = true; guess-indent.enable = true;
}; };

2
nixos/modules/work.nix
View file

@ -12,10 +12,12 @@ in {
"vscode" "vscode"
"steam-run" "steam-run"
"postman" "postman"
"drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1w" # required for mongodb "openssl-1.1.1w" # required for mongodb
"electron-27.3.11"
]; ];
networking = { networking = {

2
nixos/programs/cosmic.nix
View file

@ -14,7 +14,7 @@
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;
services.system76-scheduler.enable = true; services.system76-scheduler.enable = true;
home-manager.users.${config.user}.imports = [ home-manager.users.${config.user}.imports = [
(inputs.home-manager-cosmic.homeManagerModules.cosmic) (inputs.hm-cosmic.homeManagerModules.cosmic)
../../home/desktop/cosmic/. ../../home/desktop/cosmic/.
]; ];
} }

2
nixos/workstation.nix
View file

@ -52,7 +52,7 @@
useImage = true; useImage = true;
}; };
nixvim = { nixvim = {
transparentBackground.main = true; enable = false;
}; };
}; };
}; };