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

Merge pull request #13 from DannyDannyDanny/feat/wsl-neovim-update

Browse source 
WSL branch
This commit is contained in:
Daniel Thoren 2025-09-09 18:36:27 +02:00 • committed by GitHub
commit 0fa0933cf1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 32 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/windows_terminal/dark.settings.json
View file

@ -23,7 +23,8 @@
],
"profiles": {
"defaults": {
"colorScheme": "Catppuccin Mocha"
"colorScheme": "Catppuccin Mocha",
"bellStyle": "none"
},
"list": [
{

3
assets/windows_terminal/light.settings.json
View file

@ -23,7 +23,8 @@
],
"profiles": {
"defaults": {
"colorScheme": "Catppuccin Latte"
"colorScheme": "Catppuccin Latte",
"bellStyle": "none"
},
"list": [
{

3
bashscripts/wsl_theme.sh
View file

@ -51,3 +51,6 @@ if [ $color_scheme = 'light' ]; then
powershell.exe "timeout /t 3; taskkill /im systemsettings.exe /f"
fi
echo "setting Sound Schema to None"
powershell.exe -Command "Set-ItemProperty -Path HKCU:\AppEvents\Schemes -Name '(Default)' -Value '.None'"

197
nixos/configuration.nix
View file

@ -1,197 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{
imports = [
./hardware-configuration.nix
./tmux.nix
./neovim.nix
./fish.nix
# ./uxplay.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.luks.devices."luks-04715655-635c-46ee-8100-1a5a4f3700a5".device = "/dev/disk/by-uuid/04715655-635c-46ee-8100-1a5a4f3700a5";
networking.hostName = "nixos"; # Define your hostname.
# NOTE: You can not use networking.networkmanager with networking.wireless
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
nix.settings.experimental-features = [ "nix-command" "flakes" ]; # for vscode remote server
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "Europe/Copenhagen";
# Select internationalisation properties.
i18n.defaultLocale = "en_DK.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "da_DK.UTF-8";
LC_IDENTIFICATION = "da_DK.UTF-8";
LC_MEASUREMENT = "da_DK.UTF-8";
LC_MONETARY = "da_DK.UTF-8";
LC_NAME = "da_DK.UTF-8";
LC_NUMERIC = "da_DK.UTF-8";
LC_PAPER = "da_DK.UTF-8";
LC_TELEPHONE = "da_DK.UTF-8";
LC_TIME = "da_DK.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11
services.xserver = {
xkb.layout = "us";
xkb.variant = "";
};
programs.nix-ld.enable = true;
# TODO: move to home manager (?)
programs = {
direnv = {
enable = true;
enableFishIntegration = true;
nix-direnv.enable = true;
};
};
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound with pipewire.
services.pulseaudio.enable = false;
hardware.alsa.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.dth = {
isNormalUser = true;
description = "dth";
extraGroups = [ "networkmanager" "wheel" ];
# TODO: use home manager to define user packages
packages = with pkgs; [
vlc # video player
kate # editor
ripgrep # faster grep
nextcloud-client # private cloud
# thunderbird # bloat
];
};
# Install firefox.
programs.firefox.enable = true;
# install kde partition manager
programs.partition-manager.enable = true;
# TODO: install gnome disk manager
# programs.gnome-disks.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# tmux # activated in tmux.nix
# vim # using neovim in stead
# neovim # activated in neovim.nix
git # version control
gh # github cli tool
ripgrep # faster grep
busybox # useful programs e.g. tree, unzip etc
openssl # cryptography swiss army knife
xdg-utils # terminal desktop intergrations (i.e. allow terminal to open browser)
xclip # terminal clipboard integration (i.e. allow terminal to r/w clipboard)
neofetch # system info
btop # resource monitor
wget # downloader
tldr # community driven manpage alternative
ntfs3g # mount NTFS drives on linux
gptfdisk # formatting drives - like fdisk but better
# this stuff runs gparted
# gimp # bloat image editing
# blender # bloat 3D modelling
# inkscape # bloat vecor graphics / drawing
# kdenlive # bloat video editor
# desktop applications
thunderbird # email / calendar
telegram-desktop # instant messager
cowsay
lolcat
];
# firefox smooth scrolling
environment.sessionVariables = {
MOZ_USE_XINPUT2 = "1";
};
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.11"; # Did you read the comment?
}

1
nixos/fish.nix
View file

@ -5,6 +5,7 @@
enable = true;
shellAliases = {
theme = "bash ~/dotfiles/bashscripts/wsl_theme.sh";
music = "mpv --no-video --log-file=~/music_history.log \"$(find /mnt/c/Users/DNTH/Music/ -type f \\( -name '*.mp3' -o -name '*.wav' -o -name '*.flac' -o -name '*.m4a' -o -name '*.ogg' \\) | fzf)\"";
};
interactiveShellInit = ''
fish_vi_key_bindings

54
nixos/flake.lock generated
View file

@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
@ -34,38 +34,17 @@
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1757130842,
"narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=",
"owner": "nix-darwin",
"repo": "nix-darwin",
"rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5",
"type": "github"
},
"original": {
"owner": "nix-darwin",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1753450337,
"narHash": "sha256-l0QLEenVKuU6U2g1wI0zuf9IAm7QpisIbf8wAI6BUX4=",
"lastModified": 1736095716,
"narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "a8dfcd2962f6e788759a75b36ca86b14aa44d8e5",
"rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0",
"type": "github"
},
"original": {
@ -77,27 +56,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1751792365,
"narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"lastModified": 1733384649,
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1753429684,
"narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
@ -123,7 +102,6 @@
},
"root": {
"inputs": {
"nix-darwin": "nix-darwin",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2",
"vscode-server": "vscode-server"
@ -150,11 +128,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1753541826,
"narHash": "sha256-foGgZu8+bCNIGeuDqQ84jNbmKZpd+JvnrL2WlyU4tuU=",
"lastModified": 1729422940,
"narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
"owner": "nix-community",
"repo": "nixos-vscode-server",
"rev": "6d5f074e4811d143d44169ba4af09b20ddb6937d",
"rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
"type": "github"
},
"original": {

8
nixos/flake.nix
View file

@ -40,6 +40,8 @@
macbookair = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
nixos-wsl.nixosModules.default
vscode-server.nixosModules.default
vscode-server.nixosModules.default
./hosts/macbookair.nix
./hardware-configuration.nix
@ -47,8 +49,6 @@
./neovim.nix
./fish.nix
# home-manager.nixosModules.default
# ./configuration.nix
# ./uxplay.nix
];
};
};
@ -57,9 +57,9 @@
darwinConfigurations."Daniel-Macbook-Air" = nix-darwin.lib.darwinSystem {
modules = [
./hosts/macos.nix
# TODO: nix-darwin lacks tmux options; move to Home Manager.x
# TODO: nix-darwin lacks tmux options; move to Home Manager.x
# ./tmux.nix
# TODO: add neovim via homemanager, that should work the same for NixOS as Nix-Darwin
# TODO: add neovim via homemanager, that should work the same for NixOS as Nix-Darwin
# ./neovim.nix # NOTE: Option only exists on NixOS.
./fish.nix
];

6
nixos/hosts/wsl.nix
View file

@ -11,8 +11,6 @@
wsl = {
enable = true;
defaultUser = "nixos";
# TODO: check that this actually works, if it does, remove this comment and resolv.conf
# if not, remove this part and add URLs below to resolv.conf
wslConf.network.generateResolvConf = false;
};
@ -75,6 +73,7 @@
btop # resource monitor
tldr # community alternative to man
fzf # fuzzy finder
jq # parse json
# gimp # bloat
# blender # bloat
@ -84,6 +83,9 @@
lolcat
];
services.ollama.enable = true;
services.open-webui = { enable = true; port = 8080; };
services.vscode-server.enable = true;
security.rtkit.enable = true; # realtime kit hands out realtime scheduling priority
services.pipewire = {