cswimr/flake
cswimr/flake
Template
1
1
Fork 0
Code Issues 4 Pull requests 1 Activity

Compare commits

base: cswimr:c873a86f32610c39e03a4e0b38111ccbaccad37e
Branches Tags
cswimr:master
cswimr:renovate/lock-file-maintenance
..
compare: cswimr:71072554e7e2da275b88a6b20a5243b80b17608d
Branches Tags
cswimr:renovate/lock-file-maintenance
cswimr:master

No commits in common. "c873a86f32610c39e03a4e0b38111ccbaccad37e" and "71072554e7e2da275b88a6b20a5243b80b17608d" have entirely different histories.
c873a86f32 ... 71072554e7

9 changed files with 51 additions and 93 deletions
Show stats Expand all files Collapse all files

12
config/xonsh/aliases.py
View file

@ -106,12 +106,12 @@ alias_dictionary = {
"cat": "bat", "cat": "bat",
"git": "hub", "git": "hub",
"l": "eza -lhg --time-style=long-iso --icons=auto --hyperlink", "l": "eza -lhg --time-style=long-iso --icons=auto",
"la": "eza -lAh --time-style=long-iso --icons=auto --hyperlink", "la": "eza -lAh --time-style=long-iso --icons=auto",
"ll": "eza -lhg --time-style=long-iso --icons=auto --hyperlink", "ll": "eza -lhg --time-style=long-iso --icons=auto",
"ls": "eza --time-style=long-iso --icons=auto --hyperlink", "ls": "eza --time-style=long-iso --icons=auto",
"lsa": "eza -lah --time-style=long-iso --icons=auto --hyperlink", "lsa": "eza -lah --time-style=long-iso --icons=auto",
"tree": "eza --tree --git-ignore --time-style=long-iso --icons=auto --hyperlink", "tree": "eza --tree --git-ignore --time-style=long-iso --icons=auto",
"create-devenv": "nix flake init --template github:cachix/devenv and direnv allow", "create-devenv": "nix flake init --template github:cachix/devenv and direnv allow",
"dev": "nix develop --no-pure-eval", "dev": "nix develop --no-pure-eval",

85
flake.lock generated
View file

@ -155,11 +155,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1730504689,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733318908, "lastModified": 1732021966,
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +318,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1733389730,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1733175814,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "bf23fe41082aa0289c209169302afd3397092f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733570843, "lastModified": 1733105089,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8", "rev": "c6b65d946097baf3915dd51373251de98199280d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,26 +444,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1733629314,
"narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-pre-commit": { "nix-pre-commit": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -494,11 +474,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1733623412, "lastModified": 1733450215,
"narHash": "sha256-Dc7xuCu6XaSTYbfRxQDHl0nW8mgIXWr8YRBOEmm9GMk=", "narHash": "sha256-j5RQdK/7YBRVSyuh3ulNh3jwOUYsLSm8tNCllqHtFAo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "094ded90ffc925bca8a44ef47f03f229c9fc68f2", "rev": "7c4dd5efb640e7298dedf7dcdf72b62de79f7aa4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,11 +537,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733581040, "lastModified": 1733392399,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,11 +582,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1733667809, "lastModified": 1733431684,
"narHash": "sha256-RajfsaKZIc3bk75wiaw+ZYVDSMljdLWW69VCT90f05w=", "narHash": "sha256-Tbdi0SEOuxABTDp0sCI7wdTnmpcnQOPzPo4jSWP0u+8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e2f81c8e8e8baa28b100e0e43b721f16de6299d8", "rev": "6348336db0e0b17ab6d9c73bc8206db84ebf00d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,11 +605,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733411491, "lastModified": 1733006402,
"narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +650,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733578387, "lastModified": 1733410572,
"narHash": "sha256-XkMZGeqg0GCRoSXvMcaHP7bdvWPRZxCK1sw1ASsc16E=", "narHash": "sha256-XkMZGeqg0GCRoSXvMcaHP7bdvWPRZxCK1sw1ASsc16E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "2a64e173f1effdcc86e25cba0601e8feedf89115", "rev": "92721d7402526599366d00e242813798e9914970",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,7 +697,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixvim": "nixvim", "nixvim": "nixvim",
@ -824,11 +803,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733440889, "lastModified": 1732894027,
"narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -24,10 +24,6 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
compose2nix = { compose2nix = {
url = "github:aksiksi/compose2nix"; url = "github:aksiksi/compose2nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -105,9 +101,6 @@
} }
) )
inputs.nix-index-database.nixosModules.nix-index
{ programs.nix-index-database.comma.enable = true; }
# Home Manager # Home Manager
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

27
home-manager/vscode.nix
View file

@ -30,16 +30,13 @@ rec {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
enableUpdateCheck = false; package = pkgs.vscode.fhsWithPackages (
enableExtensionUpdateCheck = false; ps: with pkgs; [
package = pkgs.vscode; dotnetCorePackages.sdk_8_0
# package = pkgs.vscode.fhsWithPackages ( jdk21
# ps: with pkgs; [ go
# dotnetCorePackages.sdk_8_0 ]
# jdk21 );
# go
# ]
# );
extensions = extensions =
with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace; with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace;
with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace-release; with inputs.nix-vscode-extensions.extensions.${system}.vscode-marketplace-release;
@ -67,10 +64,10 @@ rec {
catppuccin.catppuccin-vsc-icons catppuccin.catppuccin-vsc-icons
# C# # C#
pkgs.vscode-extensions.ms-dotnettools.csharp ms-dotnettools.csharp
pkgs.vscode-extensions.ms-dotnettools.csdevkit ms-dotnettools.csdevkit
pkgs.vscode-extensions.ms-dotnettools.vscodeintellicode-csharp ms-dotnettools.vscodeintellicode-csharp
pkgs.vscode-extensions.ms-dotnettools.vscode-dotnet-runtime ms-dotnettools.vscode-dotnet-runtime
csharpier.csharpier-vscode csharpier.csharpier-vscode
patcx.vscode-nuget-gallery patcx.vscode-nuget-gallery
@ -100,7 +97,7 @@ rec {
nightrains.robloxlsp nightrains.robloxlsp
# Go # Go
pkgs.vscode-extensions.golang.go golang.go
# Hugo # Hugo
budparr.language-hugo-vscode budparr.language-hugo-vscode

7
nixos/development.nix
View file

@ -1,11 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ devenv ];
devenv
dotnetCorePackages.sdk_8_0
#jdk21
#go
];
programs.direnv = { programs.direnv = {
enable = true; enable = true;

1
nixos/flatpak.nix
View file

@ -1,7 +1,6 @@
{ {
services.flatpak = { services.flatpak = {
enable = true; enable = true;
update.onActivation = true;
packages = [ packages = [
{ {
flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; flatpakref = "https://sober.vinegarhq.org/sober.flatpakref";

1
nixos/gaming.nix
View file

@ -11,6 +11,5 @@
protonup-qt protonup-qt
protontricks protontricks
winetricks winetricks
celeste64
]; ];
} }

1
nixos/pkg.nix
View file

@ -55,7 +55,6 @@ let
sops sops
ssh-to-age ssh-to-age
busybox busybox
nix-search
python311 python311
python311Packages.python-lsp-server python311Packages.python-lsp-server

3
nixos/shell.nix
View file

@ -67,8 +67,6 @@
# even though we don't use bash as our shell, xonsh uses bash completion scripts # even though we don't use bash as our shell, xonsh uses bash completion scripts
programs.bash.completion.enable = true; programs.bash.completion.enable = true;
programs.command-not-found.enable = false;
users.defaultUserShell = pkgs.xonsh; users.defaultUserShell = pkgs.xonsh;
programs.xonsh = programs.xonsh =
let let
@ -84,7 +82,6 @@
xontrib load clp xontrib load clp
xontrib load direnv xontrib load direnv
xontrib load sh xontrib load sh
source-bash ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
''; '';
package = pkgs.xonsh.override { package = pkgs.xonsh.override {
extraPackages = ps: [ extraPackages = ps: [