opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

stable

Browse source
This commit is contained in:
Oliver Davies 2023-10-03 23:04:08 +01:00
parent 3057cde69e
commit 7b86cafc22
6 changed files with 48 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1693611461, "lastModified": 1696343447,
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,43 +24,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695738267, "lastModified": 1695108154,
"narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695360818, "lastModified": 1696039360,
"narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-2305": {
"locked": {
"lastModified": 1695559356,
"narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +57,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1693471703, "lastModified": 1696019113,
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,12 +72,28 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1696019113,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-2305": "nixpkgs-2305" "nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

8
flake.nix
View file

@ -1,9 +1,9 @@
{ {
inputs = { inputs = {
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/release-23.05";
nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
}; };
outputs = inputs@{ flake-parts, self, ... }: outputs = inputs@{ flake-parts, self, ... }:
@ -11,7 +11,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
username = "opdavies"; username = "opdavies";
nixos-system = import ./system/nixos { inherit inputs self username; }; nixos-system = import ./system/nixos { inherit inputs self system username; };
wsl-system = import ./system/wsl2 { inherit inputs self system username; }; wsl-system = import ./system/wsl2 { inherit inputs self system username; };
in in
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {

8
system/nixos/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { inputs, pkgs, system }:
let let
configure-gtk = pkgs.writeTextFile { configure-gtk = pkgs.writeTextFile {
@ -120,7 +120,6 @@ in
brightnessctl brightnessctl
configure-gtk configure-gtk
ffmpegthumbnailer ffmpegthumbnailer
google-chrome
shotwell shotwell
swaybg swaybg
xfce.thunar xfce.thunar
@ -182,8 +181,7 @@ in
monospace = [ "JetBrainsMono Nerd Font Mono" ]; monospace = [ "JetBrainsMono Nerd Font Mono" ];
}; };
}; };
fonts = with pkgs; [ fonts = with inputs.nixpkgs-unstable.legacyPackages."${system}"; [
intel-one-mono
(nerdfonts.override { (nerdfonts.override {
fonts = [ fonts = [
"FiraCode" "FiraCode"
@ -221,7 +219,7 @@ in
in in
{ {
enable = true; enable = true;
plugins = lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ]; plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
udevmonConfig = '' udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE" - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
DEVICE: DEVICE:

6
system/nixos/default.nix
View file

@ -1,9 +1,11 @@
{ inputs, self, username }: { inputs, self, system, username }:
{ desktop }: { desktop }:
let let
configuration = import ./configuration.nix; pkgs = inputs.nixpkgs.legacyPackages."${system}";
configuration = import ./configuration.nix { inherit inputs pkgs system; };
hardware-configuration = import ./hardware-configuration.nix; hardware-configuration = import ./hardware-configuration.nix;
in in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {

4
system/shared/home-manager-packages.nix
View file

@ -6,7 +6,7 @@ with pkgs; [
delta delta
dog dog
doppler doppler
inputs.nixpkgs-2305.legacyPackages."${system}".exa exa
fd fd
file file
fzf fzf
@ -18,6 +18,7 @@ with pkgs; [
go go
htop htop
inotify-tools inotify-tools
inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
jq jq
just just
lua lua
@ -25,7 +26,6 @@ with pkgs; [
neofetch neofetch
pv pv
ripgrep ripgrep
rustywind
terraform terraform
tldr tldr
tree tree

9
system/shared/home-manager.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, self, username }: { inputs, pkgs, username, self }:
let let
customVim = with self; { customVim = with self; {
@ -566,6 +566,7 @@ in
''; '';
} }
inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.refactoring-nvim
vimPlugins.comment-nvim vimPlugins.comment-nvim
vimPlugins.dial-nvim vimPlugins.dial-nvim
vimPlugins.gitsigns-nvim vimPlugins.gitsigns-nvim
@ -573,7 +574,6 @@ in
vimPlugins.impatient-nvim vimPlugins.impatient-nvim
vimPlugins.indent-blankline-nvim vimPlugins.indent-blankline-nvim
vimPlugins.nvim-web-devicons vimPlugins.nvim-web-devicons
vimPlugins.refactoring-nvim
vimPlugins.rest-nvim vimPlugins.rest-nvim
vimPlugins.splitjoin-vim vimPlugins.splitjoin-vim
vimPlugins.todo-comments-nvim vimPlugins.todo-comments-nvim
@ -627,11 +627,11 @@ in
# LSP # LSP
customVim.none-ls-nvim customVim.none-ls-nvim
# inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
vimPlugins.lsp-status-nvim vimPlugins.lsp-status-nvim
vimPlugins.nvim-lspconfig vimPlugins.nvim-lspconfig
# Completion # Completion
inputs.nixpkgs-2305.legacyPackages."${system}".vimPlugins.phpactor
vimPlugins.cmp-buffer vimPlugins.cmp-buffer
vimPlugins.cmp-cmdline vimPlugins.cmp-cmdline
vimPlugins.cmp-nvim-lsp vimPlugins.cmp-nvim-lsp
@ -643,6 +643,7 @@ in
vimPlugins.cmp_luasnip vimPlugins.cmp_luasnip
vimPlugins.lspkind-nvim vimPlugins.lspkind-nvim
vimPlugins.nvim-cmp vimPlugins.nvim-cmp
vimPlugins.phpactor
# Snippets # Snippets
vimPlugins.friendly-snippets vimPlugins.friendly-snippets
@ -691,8 +692,8 @@ in
# Language servers # Language servers
ansible-language-server ansible-language-server
gopls gopls
inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua-language-server lua-language-server
nixd
nodePackages.intelephense nodePackages.intelephense
nodePackages."@astrojs/language-server" nodePackages."@astrojs/language-server"
nodePackages."@tailwindcss/language-server" nodePackages."@tailwindcss/language-server"