tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

WIP: Replace nix-ld with nixpkgs version & downgrade bitwarden

Browse source
This commit is contained in:
Tristan D. 2023-12-15 02:21:35 +01:00
parent 6ce485ac86
commit b0e44a8713
Signed by: tristan
SSH key fingerprint: SHA256:3RU4RLOoM8oAjFU19f1W6t8uouZbA7GWkaSW6rjp1k8
5 changed files with 45 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
flake.lock generated
View file

@ -10,11 +10,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1702495959, "lastModified": 1702575705,
"narHash": "sha256-xLYLHlF0wsBNQtC1FMYHhhu13lRUxFh8uEMkv5/427g=", "narHash": "sha256-j8jaOtke/iwZgXe+o4uE7dnwv8GoBrG2mpoxQoRe0SE=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "7369da9bf46df08ec2d4793f72e7000d511864e4", "rev": "ea53eaf36957528b6ec099d317b7a20430227d27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702479765, "lastModified": 1702569759,
"narHash": "sha256-wjNYsFhciYoJkZ/FBKvFj55k+vkLbu6C2qYQ7K+s8pI=", "narHash": "sha256-Ze3AdEEsVZBRJ4wn13EZpV1Uubkzi59TkC4j2G9xoFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bd8fbc3f274288ac905bcea66bc2a5428abde458", "rev": "98ab91109716871f50ea8cb0e0ac7cc1e1e14714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,12 +233,12 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702423270, "lastModified": 1702537497,
"narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=", "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=",
"rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db", "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9",
"revCount": 3189, "revCount": 3192,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3189%2Brev-d9297efd3a1c3ebb9027dc68f9da0ac002ae94db/018c6056-840b-7cf1-807e-7eba8b631300/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -286,26 +286,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-ld": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1701153607,
"narHash": "sha256-h+odOVyiGmEERMECoFOj5P7FPiMR8IPRzroFA4sKivg=",
"owner": "Mic92",
"repo": "nix-ld",
"rev": "bf5aa84a713c31d95b4307e442e966d6c7fd7ae7",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-ld",
"type": "github"
}
},
"nix-wallpaper": { "nix-wallpaper": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -498,11 +478,11 @@
"osx-kvm": "osx-kvm" "osx-kvm": "osx-kvm"
}, },
"locked": { "locked": {
"lastModified": 1702308270, "lastModified": 1702568730,
"narHash": "sha256-yHfRDaaUUAzVTnmm+l0b0HRy1DCfjUsiUZGufBcfTCI=", "narHash": "sha256-+0uxop69FWeraPq2glDvtGZUAXUXs5yqutWFFfrf2fQ=",
"owner": "matthewcroughan", "owner": "matthewcroughan",
"repo": "nixtheplanet", "repo": "nixtheplanet",
"rev": "1c05db4c929d8e1617c3c9f8f4fa1a5a9aca97ec", "rev": "40b9d6f7b513b4f08273a8888645654af903e798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +493,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702547108, "lastModified": 1702599384,
"narHash": "sha256-1SZWYPXMaQdsDPrqWd4iTORb7ZnzUWPfEHACHdc+lRI=", "narHash": "sha256-W39mE6STcvX6k30xzk4/DGLajrYVEtp6SIOgzN4fDHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "18310bf0ad74f04a57a89a70d52d78e719e46774", "rev": "8cf518b0011e34505344cc78732a977d1d4ea453",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -600,7 +580,6 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-ld": "nix-ld",
"nix-wallpaper": "nix-wallpaper", "nix-wallpaper": "nix-wallpaper",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",

5
flake.nix
View file

@ -47,10 +47,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
nix-ld = {
url = "github:Mic92/nix-ld";
inputs.nixpkgs.follows = "nixpkgs";
};
nixtheplanet.url = "github:matthewcroughan/nixtheplanet"; nixtheplanet.url = "github:matthewcroughan/nixtheplanet";
}; };
@ -107,7 +103,6 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
nix-index-database.nixosModules.nix-index nix-index-database.nixosModules.nix-index
nur.nixosModules.nur nur.nixosModules.nur
inputs.nix-ld.nixosModules.nix-ld
chaotic.nixosModules.default chaotic.nixosModules.default
nixtheplanet.nixosModules.macos-ventura nixtheplanet.nixosModules.macos-ventura
]; ];

52
home-mods/desktop/default.nix
View file

@ -19,33 +19,33 @@ in
home = { home = {
file.".background".source = wallpaperPath; file.".background".source = wallpaperPath;
packages = with pkgs.unstable-pkgs; [ packages = with pkgs; [
airshipper
ardour
# blender
bitwarden bitwarden
brave unstable-os.airshipper
cavalier unstable-os.ardour
freetube # blender
filelight unstable-pkgs.brave
element-desktop unstable-os.cavalier
inkscape unstable-os.freetube
jellyfin-media-player unstable-os.filelight
miraclecast unstable-os.element-desktop
kate unstable-os.inkscape
kdenlive unstable-os.jellyfin-media-player
krita # unstable-os.miraclecast
libsForQt5.kdeconnect-kde unstable-os.kate
libsForQt5.plasma-vault unstable-os.kdenlive
libsForQt5.plasma-browser-integration unstable-os.krita
nextcloud-client unstable-os.libsForQt5.kdeconnect-kde
onlyoffice-bin unstable-os.libsForQt5.plasma-vault
protonup-qt unstable-os.libsForQt5.plasma-browser-integration
rustdesk unstable-os.nextcloud-client
signal-desktop unstable-os.onlyoffice-bin
tutanota-desktop unstable-os.protonup-qt
thunderbird unstable-os.rustdesk
webcord-vencord unstable-os.signal-desktop
unstable-os.tutanota-desktop
unstable-pkgs.thunderbird
unstable-pkgs.webcord-vencord
]; ];
}; };
} }

2
os-mods/common/default.nix
View file

@ -119,7 +119,7 @@
"last_login" "last_login"
]; ];
}; };
nix-ld.dev.enable = true; nix-ld.enable = true;
command-not-found.enable = false; command-not-found.enable = false;
nix-index-database.comma.enable = true; nix-index-database.comma.enable = true;

2
users/admin-thin.nix
View file

@ -9,7 +9,7 @@
../home-mods/audio ../home-mods/audio
../home-mods/common ../home-mods/common
../home-mods/firefox ../home-mods/firefox
../home-mods/plasma # ../home-mods/plasma
../home-mods/shell ../home-mods/shell
]; ];