seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-11-09 18:47:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: seang96:9379108490f69786843d6d95eb584c5642787847
Branches Tags
seang96:master
...
compare: seang96:63aefa9edf4313037a5d68f936c4844b0e1ebb05
Branches Tags
seang96:master

3 commits
9379108490 ... 63aefa9edf

Author SHA1 Message Date
Sean Buckley
63aefa9edf make sure desktops apps only install on desktops 2024-10-18 00:13:23 -04:00
Sean Buckley
c2fa267fac Revert "fix powerline jobs display" 
This reverts commit a7ca02290b.
 2024-10-13 23:31:16 -04:00
Sean Buckley
430551139f flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c31898adf5a8ed202ce5bea9f347b1c6871f32d1' (2024-10-06)
  → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09)
 2024-10-13 02:12:13 -04:00
4 changed files with 49 additions and 45 deletions
Show stats Expand all files Collapse all files

12
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": {
"impermanence": {
"locked": {
"lastModified": 1725690722,
"narHash": "sha256-4qWg9sNh5g1qPGO6d/GV2ktY+eDikkBTbWSg5/iD2nY=",
"lastModified": 1727649413,
"narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "63f4d0443e32b0dd7189001ee1894066765d18a5",
"rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
"type": "github"
},
"original": {
@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {

2
modules/cli/powerline.nix
View file

@ -27,7 +27,7 @@ let
"-git-assume-unchanged-size 0"
"-theme /etc/powerline-theme.json"
"-path-aliases '~/git=~/git'"
"-jobs $(jobs -pr | wc -l)"
"-jobs $(jobs -p | wc -l)"
];
termtitle = ''\[\e]0;\u@\h: \w\a\]'';

16
modules/desktop/alacritty.nix
View file

@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{ config, lib, pkgs, ... }:
let
config = (pkgs.formats.toml { }).generate "alacritty.toml"
aconfig = (pkgs.formats.toml { }).generate "alacritty.toml"
{
env.TERM = "xterm-256color";
font.size = 12;
@ -32,9 +32,11 @@ let
in
{
environment.etc."xdg/alacritty.toml".source = config;
environment.systemPackages = [
(lib.hiPrio notify-fix)
pkgs.alacritty
];
config = lib.mkIf (config.sconfig.desktop.enable) {
environment.etc."xdg/alacritty.toml".source = aconfig;
environment.systemPackages = [
(lib.hiPrio notify-fix)
pkgs.alacritty
];
};
}

64
modules/desktop/vscode.nix
View file

@ -1,35 +1,37 @@
{ pkgs, ... }:
{ config, lib, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
(vscode-with-extensions.override {
vscodeExtensions = with pkgs.vscode-extensions; [
esbenp.prettier-vscode
jnoortheen.nix-ide
ms-azuretools.vscode-docker
ms-python.python
redhat.vscode-yaml
shardulm94.trailing-spaces
];
})
];
config = lib.mkIf (config.sconfig.desktop.enable) {
environment.systemPackages = with pkgs; [
(vscode-with-extensions.override {
vscodeExtensions = with pkgs.vscode-extensions; [
esbenp.prettier-vscode
jnoortheen.nix-ide
ms-azuretools.vscode-docker
ms-python.python
redhat.vscode-yaml
shardulm94.trailing-spaces
];
})
];
environment.etc."bck-settings.sh".text = ''
mkdir -p ~/.config/Code/User
ln -sf /etc/vscode-settings.json ~/.config/Code/User/settings.json
ln -sf /etc/vscode-keybindings.json ~/.config/Code/User/keybindings.json
'';
environment.etc."bck-settings.sh".text = ''
mkdir -p ~/.config/Code/User
ln -sf /etc/vscode-settings.json ~/.config/Code/User/settings.json
ln -sf /etc/vscode-keybindings.json ~/.config/Code/User/keybindings.json
'';
environment.etc."vscode-keybindings.json".source = ./vscode-keybindings.json;
environment.etc."vscode-settings.json".text = builtins.toJSON (
(
builtins.fromJSON (builtins.readFile ./vscode-settings.json)
) // {
# NixOS-specific vscode settings:
"extensions.autoCheckUpdates" = false;
"extensions.autoUpdate" = false;
"terminal.external.linuxExec" = "x-terminal-emulator";
"terminal.integrated.fontFamily" = "DejaVuSansM Nerd Font";
"update.mode" = "none";
}
);
environment.etc."vscode-keybindings.json".source = ./vscode-keybindings.json;
environment.etc."vscode-settings.json".text = builtins.toJSON (
(
builtins.fromJSON (builtins.readFile ./vscode-settings.json)
) // {
# NixOS-specific vscode settings:
"extensions.autoCheckUpdates" = false;
"extensions.autoUpdate" = false;
"terminal.external.linuxExec" = "x-terminal-emulator";
"terminal.integrated.fontFamily" = "DejaVuSansM Nerd Font";
"update.mode" = "none";
}
);
};
}