Compare commits

..

No commits in common. "dc36f63e52b153384dad7e853d63a7bac9116819" and "c8e67545d0231acc0d6377eb052a68bd59f8faad" have entirely different histories.

9 changed files with 67 additions and 89 deletions

116
flake.lock generated
View file

@ -26,11 +26,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1741229528, "lastModified": 1736708527,
"narHash": "sha256-21DoV4SMueMFRHMsvfsPfQIOtsvRWNY06rE4gB7xFnc=", "narHash": "sha256-/JQo2XnLF8qfSQKvjuFDtvzzz/QHO/dLBHJO4vLOXNk=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "3d76c74c80485931425464fec0e59d6cb461677a", "rev": "c25187332e19c633b956a6755a7971a6591d3e8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,29 +39,6 @@
"type": "github" "type": "github"
} }
}, },
"csharp-language-server": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1743061507,
"narHash": "sha256-M605lQQ035J61tZ48tye8JUCN4MZKXhcTP3SqXqtr4g=",
"owner": "SofusA",
"repo": "csharp-language-server",
"rev": "a119d6002874d9335dbff0a9445f652762eb6685",
"type": "github"
},
"original": {
"owner": "SofusA",
"repo": "csharp-language-server",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -132,11 +109,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1742773104, "lastModified": 1739457209,
"narHash": "sha256-dAhrL+gEjNN5U/Sosy7IrX0Y0qPA0U7Gp9TBhqEliNU=", "narHash": "sha256-aIFi91DhSVtsiinX3OmjHIhBmkA6VKwQZf7RRgaHScw=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "d74460da63a8c08a69a1f143b04f2ab1a6b2f5c2", "rev": "5ff0742fc6c2156e8d9b0fbb43678b0d3e8ce578",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -217,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1738453229,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +310,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742655702, "lastModified": 1736373539,
"narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -391,15 +368,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable"
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1742863891, "lastModified": 1739415434,
"narHash": "sha256-/mGCIxO7zlWCHOZLaOMRoJgSLpIav0PBKWG3BQddElw=", "narHash": "sha256-ToTH8JnLcpclRT4jLrlSHhD7CfNmtGnVLZno60ziglc=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "366999efebcad2165f472ef93e9c996693bda75d", "rev": "b5ee5262ada13884a6b56ea93eec8ea6f12e3624",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,11 +386,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1742806253, "lastModified": 1738816619,
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +401,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742751704, "lastModified": 1739357830,
"narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -441,11 +417,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1742512142, "lastModified": 1739206421,
"narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "rev": "44534bc021b85c8d78e465021e21f33b856e2540",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +433,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1742669843, "lastModified": 1739214665,
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e5b653dff12029333a6546c11e108ede13052eb", "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +472,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1742893502, "lastModified": 1739438287,
"narHash": "sha256-W8M7Kzat8ySVY+bBW0FF6jB4xjdb8sLm14OHVyyu0KQ=", "narHash": "sha256-glDed6Vp6lAn7dkx/9O3Y2CMo675lB4A/Ydbfn0fesA=",
"owner": "astro", "owner": "astro",
"repo": "nix-openwrt-imagebuilder", "repo": "nix-openwrt-imagebuilder",
"rev": "89d3674159e5606b0c1db636e7c7463b7b976b45", "rev": "bc7334b11e21abaed14264db9f7fa99c1da460de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +494,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742649964, "lastModified": 1737465171,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -535,7 +511,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"arkenfox-userjs": "arkenfox-userjs", "arkenfox-userjs": "arkenfox-userjs",
"csharp-language-server": "csharp-language-server",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -548,27 +523,30 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nvim-kitty-navigator": "nvim-kitty-navigator", "nvim-kitty-navigator": "nvim-kitty-navigator",
"openwrt-imagebuilder": "openwrt-imagebuilder", "openwrt-imagebuilder": "openwrt-imagebuilder",
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks",
"roslyn-language-server": "roslyn-language-server"
} }
}, },
"rust-overlay": { "roslyn-language-server": {
"inputs": { "inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixos-cosmic",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1742437918, "lastModified": 1739209199,
"narHash": "sha256-Vflb6KJVDikFcM9E231mRN88uk4+jo7BWtaaQMifthI=", "narHash": "sha256-IXemY38IgENRcnBw2/0hBkUU8dNwZr+kzrrVQd4EH/o=",
"owner": "oxalica", "owner": "SofusA",
"repo": "rust-overlay", "repo": "roslyn-language-server",
"rev": "f03085549609e49c7bcbbee86a1949057d087199", "rev": "e1e9831f8fc83121f87516b00401cca409392c29",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "oxalica", "owner": "SofusA",
"repo": "rust-overlay", "repo": "roslyn-language-server",
"type": "github" "type": "github"
} }
}, },

View file

@ -80,8 +80,8 @@ rec {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
csharp-language-server = { roslyn-language-server = {
url = "github:SofusA/csharp-language-server"; url = "github:SofusA/roslyn-language-server";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };

View file

@ -140,7 +140,7 @@ in
}; };
}; };
}; };
roslyn.command = "csharp-language-server"; roslyn.command = "roslyn-language-server";
statix = { statix = {
command = "efm-langserver"; command = "efm-langserver";
config = { config = {

View file

@ -5,15 +5,7 @@
# language servers # language servers
efm-langserver efm-langserver
unstable.roslyn-ls unstable.roslyn-ls
(pkgs.symlinkJoin { inputs.roslyn-language-server.packages.${system}.roslyn-language-server
name = "csharp-language-server";
paths = [ inputs.csharp-language-server.packages.${system}.csharp-language-server ];
buildInputs = [ pkgs.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/csharp-language-server \
--prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.dotnet-sdk_9 ]}"
'';
})
omnisharp-roslyn omnisharp-roslyn
nil nil
unstable.nixd unstable.nixd

View file

@ -13,6 +13,7 @@ with pkgs;
./editors ./editors
./desktop ./desktop
./git.nix ./git.nix
./keybase.nix
./element.nix ./element.nix
./signal.nix ./signal.nix
./browsers ./browsers

View file

@ -8,6 +8,7 @@
./desktop ./desktop
./desktop/monitors.nix ./desktop/monitors.nix
./git.nix ./git.nix
./keybase.nix
./element.nix ./element.nix
./signal.nix ./signal.nix
./browsers ./browsers

8
home/keybase.nix Normal file
View file

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
services.keybase.enable = true;
# services.kbfs.enable = true;
home.packages = [ pkgs.keybase-gui ];
}

View file

@ -1,12 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ services.trayscale = {
unstable.trayscale enable = true;
(makeAutostartItem { package = pkgs.unstable.trayscale;
name = "dev.deedles.Trayscale"; };
package = unstable.trayscale;
prependExtraArgs = [ "--hide-window" ];
})
];
} }

View file

@ -66,6 +66,7 @@ in
"/home/*/.local/share/gnome-boxes" "/home/*/.local/share/gnome-boxes"
"/home/*/.local/share/bottles" "/home/*/.local/share/bottles"
"/home/*/.local/share/Steam" "/home/*/.local/share/Steam"
"/home/*/.local/share/keybase"
"/home/*/.local/share/libvirt" "/home/*/.local/share/libvirt"
"/home/*/.local/share/lutris" "/home/*/.local/share/lutris"
"/home/*/.local/share/NuGet" "/home/*/.local/share/NuGet"
@ -80,6 +81,7 @@ in
"/home/*/.config/Proton Pass" "/home/*/.config/Proton Pass"
"/home/*/.config/spotify/Users" "/home/*/.config/spotify/Users"
"/home/felschr/media" "/home/felschr/media"
"/home/felschr/keybase"
"/home/felschr/dev" # backup ~/dev-backup instead "/home/felschr/dev" # backup ~/dev-backup instead
# general # general